diff src/systime.h @ 5933:c1e8f3294298 cygwin

revert timeval comment, backed out change to winsock.h and just lots of warnings??? Also updated config.inc.samp to reflect a way to work around lack of windows-runnable hg
author Henry Thompson <ht@markup.co.uk>
date Thu, 10 Dec 2015 17:55:59 +0000
parents a0d9bfe304de
children
line wrap: on
line diff
--- a/src/systime.h	Wed Dec 09 15:50:11 2015 +0000
+++ b/src/systime.h	Thu Dec 10 17:55:59 2015 +0000
@@ -47,19 +47,8 @@
 
 #ifdef WIN32_NATIVE
 
-/* This defines struct timeval */
-/* Temporary override -- HST
-#define _TIMEVAL_DEFINED
-
-struct timeval
-{
-        time_t tv_sec;
-        time_t tv_usec;
-};
-#ifndef _INC_WINDOWS
-#include <windows.h>
-#endif / * _INC_WINDOWS * /
-typedef UINT_PTR        SOCKET; */
+/* This defines struct timeval [! incorrectly (32-bit values),
+    but we seem to get away with it -- HST] */
 #include <winsock.h>
 
 struct timezone