skypiax: compiles AND links on windows ;-)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14343 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_skypiax/mod_skypiax.c b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
index 0c0af6d3e246ebb80ede42801bd42bcd20b567a3..24fe8c2531e746f274053bd1774369df3803202b 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/mod_skypiax.c
+++ b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
@@ -36,6 +36,61 @@
 
 #include "skypiax.h"
 
+#ifdef WIN32
+/***************/
+// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
+
+#include <time.h>\r
+     \r
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)\r
+#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64\r
+#else\r
+#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL\r
+#endif\r
+     \r
+    struct timezone \r
+    {\r
+      int  tz_minuteswest; /* minutes W of Greenwich */\r
+      int  tz_dsttime;     /* type of dst correction */\r
+    };\r
+     \r
+    int gettimeofday(struct timeval *tv, struct timezone *tz)\r
+    {\r
+      FILETIME ft;\r
+      unsigned __int64 tmpres = 0;\r
+      static int tzflag;\r
+     \r
+      if (NULL != tv)\r
+      {\r
+        GetSystemTimeAsFileTime(&ft);\r
+     \r
+        tmpres |= ft.dwHighDateTime;\r
+        tmpres <<= 32;\r
+        tmpres |= ft.dwLowDateTime;\r
+     \r
+        /*converting file time to unix epoch*/\r
+        tmpres /= 10;  /*convert into microseconds*/\r
+        tmpres -= DELTA_EPOCH_IN_MICROSECS; \r
+        tv->tv_sec = (long)(tmpres / 1000000UL);\r
+        tv->tv_usec = (long)(tmpres % 1000000UL);\r
+      }\r
+     \r
+      if (NULL != tz)\r
+      {\r
+        if (!tzflag)\r
+        {\r
+          _tzset();\r
+          tzflag++;\r
+        }\r
+        tz->tz_minuteswest = _timezone / 60;\r
+        tz->tz_dsttime = _daylight;\r
+      }\r
+     \r
+      return 0;\r
+    }\r
+/***************/
+#endif /* WIN32 */
+
 SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown);
 SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL);

diff --git a/src/mod/endpoints/mod_skypiax/skypiax.h b/src/mod/endpoints/mod_skypiax/skypiax.h
index 6fd1f681805125f1f3c114d511eec3146abff5a9..bde8705eec86498eb6bf3778e985c9245131a0ac 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/skypiax.h
+++ b/src/mod/endpoints/mod_skypiax/skypiax.h
@@ -49,60 +49,6 @@
 //Windows macro  for FD_SET includes a warning C4127: conditional expression is constant
 #pragma warning(push)
 #pragma warning(disable:4127)
-
-/***************/
-// from http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/
-
-#include <time.h>\r
-     \r
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)\r
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64\r
-#else\r
-#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL\r
-#endif\r
-     \r
-    struct timezone \r
-    {\r
-      int  tz_minuteswest; /* minutes W of Greenwich */\r
-      int  tz_dsttime;     /* type of dst correction */\r
-    };\r
-     \r
-    int gettimeofday(struct timeval *tv, struct timezone *tz)\r
-    {\r
-      FILETIME ft;\r
-      unsigned __int64 tmpres = 0;\r
-      static int tzflag;\r
-     \r
-      if (NULL != tv)\r
-      {\r
-        GetSystemTimeAsFileTime(&ft);\r
-     \r
-        tmpres |= ft.dwHighDateTime;\r
-        tmpres <<= 32;\r
-        tmpres |= ft.dwLowDateTime;\r
-     \r
-        /*converting file time to unix epoch*/\r
-        tmpres /= 10;  /*convert into microseconds*/\r
-        tmpres -= DELTA_EPOCH_IN_MICROSECS; \r
-        tv->tv_sec = (long)(tmpres / 1000000UL);\r
-        tv->tv_usec = (long)(tmpres % 1000000UL);\r
-      }\r
-     \r
-      if (NULL != tz)\r
-      {\r
-        if (!tzflag)\r
-        {\r
-          _tzset();\r
-          tzflag++;\r
-        }\r
-        tz->tz_minuteswest = _timezone / 60;\r
-        tz->tz_dsttime = _daylight;\r
-      }\r
-     \r
-      return 0;\r
-    }\r
-/***************/
-
 #endif
 
 #define SAMPLERATE_SKYPIAX 16000