diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-08-26 17:50:17 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-08-26 17:50:17 +0100 |
commit | 060c56cc3fa05201894d56e30cc36e853a958472 (patch) | |
tree | 0cb02673bda85b4d383b80b38c5ccc64919c733e | |
parent | 9482702bdc27acda209599dfabad6e45d0aa1410 (diff) |
Minor tweaks to MSVC build (hopefully of little consequence)
-rw-r--r-- | libs/pbd/pbd/msvc_pbd.h | 2 | ||||
-rw-r--r-- | msvc_extra_headers/ardourext/sys/time.h.input | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h index 736095d9e8..628ed56e6f 100644 --- a/libs/pbd/pbd/msvc_pbd.h +++ b/libs/pbd/pbd/msvc_pbd.h @@ -82,7 +82,7 @@ extern "C" { // This function is (hopefully) temporary and is placed here // because 'g_usleep()' doesn't seem to work very well for glib-win32 -void pbd_g_usleep (unsigned long microseconds); +// JE - let's see if we can do without this now! void pbd_g_usleep (unsigned long microseconds); #ifdef __cplusplus } /* extern "C" */ diff --git a/msvc_extra_headers/ardourext/sys/time.h.input b/msvc_extra_headers/ardourext/sys/time.h.input index 11bd6bf34d..a18ae94ee4 100644 --- a/msvc_extra_headers/ardourext/sys/time.h.input +++ b/msvc_extra_headers/ardourext/sys/time.h.input @@ -1,8 +1,8 @@ #ifndef _WINX_SYS_TIME_H_ #define _WINX_SYS_TIME_H_ -//#include <features.h> -#include <WinSock2.h> // gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> +#define WIN32_LEAN_AND_MEAN /* This line found to be needed by JE - 18-08-2013. Line was formerly. . . #include <features.h> */ +#include <WinSock2.h> /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> */ #ifdef _TIMEVAL_DEFINED # define _STRUCT_TIMEVAL 1 |