From: Dave Hart <hart@ntp.org>
Date: Tue, 24 Mar 2009 15:22:36 +0000 (+0000)
Subject: config.h:
X-Git-Tag: NTP_4_2_5P160~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9fbbf8467f373e6a864e73371c3326af0fd4b06;p=thirdparty%2Fntp.git

config.h:
  include winsock.h before ws2tcpip.h to fix VS 2005 build

bk: 49c8fabcyFM2mXMRUDrOk6Pka70f6g
---

diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index d91566251..749e0b0eb 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -51,11 +51,12 @@
  * code so we don't have to see the warning messages
  */
 #ifndef _WSPIAPI_H_
-//#define _WSPIAPI_H_ // need these wrappers for ntpd.exe to load on w2k
+/* #define _WSPIAPI_H_ */ /* need these wrappers for ntpd.exe to load on w2k */
 #endif
 
 /* Include Windows headers */
 #include <windows.h>
+#include <winsock.h>
 #include <ws2tcpip.h>
 
 /*
@@ -71,7 +72,7 @@
 #include <wspiapi.h>
 #endif
 
-//#include <runtimelink.h>	/* must come after ws2tcpip.h */
+/* #include <runtimelink.h> */	/* must come after ws2tcpip.h */
 #undef interface
 #include <process.h>
 
@@ -349,9 +350,11 @@ typedef unsigned long uintptr_t;
  * _beginthreadex takes sames args as CreateThread but 
  * initializes per-thread CRT state before invoking the
  * thread function, and calls _endthreadex on its
- * return instead of ExitThread.  _MSC_VER 1200 is VC6,
- * it probably goes back further so the test might
- * need changing if someone builds with ancient MSC.
+ * return instead of ExitThread.  _MSC_VER 1200 and
+ * later (VC6) are known to have _beginthreadex.  If
+ * you introduce support for a new compiler which 
+ * has _beginthreadex in its C runtime, modify the
+ * test below so that the #define lines are inactive.
  */
 #if !defined(_MSC_VER) || (_MSC_VER < 1200)
 #define _beginthreadex CreateThread