rfb: make gettimeofday() win32 fallback a #define

Author: bk138

examples/server/camera.c

@@ -45,20 +45,6 @@
 /* if we have gettimeofday(), it is in this header */
 #include <sys/time.h>
 #endif
-#if !defined LIBVNCSERVER_HAVE_GETTIMEOFDAY && defined WIN32
-#include <fcntl.h>
-#include <conio.h>
-#include <sys/timeb.h>
-
-static void gettimeofday(struct timeval* tv,char* dummy)
-{
-   SYSTEMTIME t;
-   GetSystemTime(&t);
-   tv->tv_sec=t.wHour*3600+t.wMinute*60+t.wSecond;
-   tv->tv_usec=t.wMilliseconds*1000;
-}
-#endif
-
 
 #define WIDTH  640
 #define HEIGHT 480

libvncserver/main.c

@@ -1375,20 +1375,6 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
 #endif
 }
 
-#if !defined LIBVNCSERVER_HAVE_GETTIMEOFDAY && defined WIN32
-#include <fcntl.h>
-#include <conio.h>
-#include <sys/timeb.h>
-
-static void gettimeofday(struct timeval* tv,char* dummy)
-{
-   SYSTEMTIME t;
-   GetSystemTime(&t);
-   tv->tv_sec=t.wHour*3600+t.wMinute*60+t.wSecond;
-   tv->tv_usec=t.wMilliseconds*1000;
-}
-#endif
-
 rfbBool
 rfbProcessEvents(rfbScreenInfoPtr screen,long usec)
 {

rfb/rfbproto.h

@@ -130,6 +130,21 @@ typedef uint32_t in_addr_t;
 #define                INADDR_NONE     ((in_addr_t) 0xffffffff)
 #endif
 
+#if !defined LIBVNCSERVER_HAVE_GETTIMEOFDAY && defined WIN32
+#include <fcntl.h>
+#include <conio.h>
+#include <sys/timeb.h>
+
+#define gettimeofday(tv, dummy)                     \
+{                                                   \
+   SYSTEMTIME t;                                    \
+   GetSystemTime(&t);                               \
+   (tv)->tv_sec=t.wHour*3600+t.wMinute*60+t.wSecond;	\
+   (tv)->tv_usec=t.wMilliseconds*1000;			\
+}
+#endif
+
+
 #define MAX_ENCODINGS 64