Check in some minor modifications (to MSVC specific headers)

[ardour.git] / msvc_extra_headers / ardourext / sys / time.h.input

diff --git a/msvc_extra_headers/ardourext/sys/time.h.input b/msvc_extra_headers/ardourext/sys/time.h.input
index a18ae94ee41942a84f7ea6f9e4595f6d13365808..a0e7ce95f2ac02260a900444189860647d682716 100644 (file)
--- a/msvc_extra_headers/ardourext/sys/time.h.input
+++ b/msvc_extra_headers/ardourext/sys/time.h.input
@@ -1,8 +1,28 @@
 #ifndef _WINX_SYS_TIME_H_
 #define _WINX_SYS_TIME_H_
 
-#define WIN32_LEAN_AND_MEAN /* This line found to be needed by JE - 18-08-2013. Line was formerly. . . #include <features.h> */
+#define WIN32_LEAN_AND_MEAN          /* This line found to be needed by JE - 18-08-2013. Line was formerly. . . #include <features.h> */
+#ifndef __suseconds_t_defined        /* This section added by JE - 22-08-2013 */
+#define __suseconds_t_defined
+typedef long          __suseconds_t;
+typedef __suseconds_t   suseconds_t;
+#endif
+#ifndef BUILDING_EVORAL
 #include <WinSock2.h> /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> */
+/* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */
+/* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't  */
+/* edit 'rpc.h' or 'WinSock2.h', just make sure we don't #include them when building libevoral.   */
+
+/* Type of the second argument to `getitimer' and
+   the second and third arguments `setitimer'.  */
+struct itimerval
+  {
+    /* Value to put into `it_value' when the timer expires.  */
+    struct timeval it_interval;
+    /* Time to the next timer expiration.  */
+    struct timeval it_value;
+  };
+#endif
 
 #ifdef _TIMEVAL_DEFINED
 # define _STRUCT_TIMEVAL     1
@@ -55,9 +75,18 @@ typedef void *__restrict __timezone_ptr_t;
    Returns 0 on success, -1 on errors.
    NOTE: This form of timezone information is obsolete.
    Use the functions and variables declared in <time.h> instead.  */
+#ifdef LIBPBD_DLL /* JE - use the version that's available from libpbd */
+#ifdef LIBPBD_API
+LIBPBD_API int __cdecl gettimeofday (struct timeval *__restrict __tv,
+                __timezone_ptr_t __tz) __THROW;
+#else
+__declspec(dllimport) int __cdecl gettimeofday (struct timeval *__restrict __tv,
+                __timezone_ptr_t __tz) __THROW;
+#endif
+#else
 extern int gettimeofday (struct timeval *__restrict __tv,
                 __timezone_ptr_t __tz) __THROW;
-
+#endif
 extern int getntptimeofday (struct timespec *__restrict __tp,
                 __timezone_ptr_t __tz) __THROW;
 
@@ -85,16 +114,6 @@ extern int setntptimeofday (__const struct timespec *__tp,
 //#define ITIMER_PROF ITIMER_PROF
 //  };
 
-/* Type of the second argument to `getitimer' and
-   the second and third arguments `setitimer'.  */
-struct itimerval
-  {
-    /* Value to put into `it_value' when the timer expires.  */
-    struct timeval it_interval;
-    /* Time to the next timer expiration.  */
-    struct timeval it_value;
-  };
-
 #if defined __USE_GNU && !defined __cplusplus
 /* Use the nicer parameter type only in GNU mode and not for C++ since the
    strict C++ rules prevent the automatic promotion.  */