Minor tweaks to MSVC build (hopefully of little consequence)

diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h
index 736095d9e848abacf99d6f310d23b41707e528c6..628ed56e6fe9ea1b85d7044626e10853eebc3ba8 100644 (file)
--- 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 11bd6bf34db3bbed6358d10f62570843eba46b02..a18ae94ee41942a84f7ea6f9e4595f6d13365808 100644 (file)
--- 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