Merge branch 'dev-fix-multicast-windows' of github.com:ethouris/srt i…

…nto dev-fix-multicast-windows

CMakeLists.txt

@@ -440,6 +440,10 @@ if ( ENABLE_CXX11 )
 		${CMAKE_SOURCE_DIR}/common/transmitmedia.cpp
 		${CMAKE_SOURCE_DIR}/common/srt_compat.c
 	)
+	# Enforce interpreting this file as C++ so that C++ compiler is used to compile it.
+	# This should result in exactly the same as when it was compiled as C, with the
+	# exception that the compiler with accept any C++-only COMPILE_FLAGS (e.g. -std=c++11).
+	set_source_files_properties(${CMAKE_SOURCE_DIR}/common/srt_compat.c PROPERTIES LANGUAGE CXX )
 
 	add_executable(srt-live-transmit
 		${CMAKE_SOURCE_DIR}/apps/srt-live-transmit.cpp

common/srt_compat.c

@@ -49,6 +49,10 @@ written by
 #include <mach/mach_time.h>
 #include <AvailabilityMacros.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 int OSX_clock_gettime(clockid_t clock_id, struct timespec * ts)
 {
@@ -137,8 +141,15 @@ int OSX_clock_gettime(clockid_t clock_id, struct timespec * ts)
    return result;
 }
 
+#ifdef __cplusplus
+} // extern C
+#endif
+
 #endif // (__MACH__)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 extern const char * SysStrError(int errnum, char * buf, size_t buflen)
 {
@@ -202,3 +213,8 @@ extern const char * SysStrError(int errnum, char * buf, size_t buflen)
    }
 #endif
 }
+
+
+#ifdef __cplusplus
+} // extern C
+#endif

common/srt_compat.h

@@ -26,6 +26,7 @@ written by
 #define HAISRT_COMPAT_H__
 
 #include <stddef.h>
+#include <time.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,7 +37,6 @@ extern "C" {
 #if defined(__MACH__)
 
 #include <AvailabilityMacros.h>
-#include <time.h>
 #include <errno.h>
 #include <pthread.h>
 #include <string.h>
@@ -187,7 +187,6 @@ inline struct tm LocalTime(time_t tt)
 }
 
 
-
-#endif
+#endif // defined C++
 
 #endif // HAISRT_COMPAT_H__