Author: cazfi
Date: Sun Jan 3 17:35:37 2016
New Revision: 31338
URL: http://svn.gna.org/viewcvs/freeciv?rev=31338&view=rev
Log:
Include <winsock2.h>, not <ws2tcpip.h> to fcthread.h
See patch #6769
Modified:
branches/S2_6/utility/fcthread.h
Modified: branches/S2_6/utility/fcthread.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/fcthread.h?rev=31338&r1=31337&r2=31338&view=diff
==============================================================================
--- branches/S2_6/utility/fcthread.h (original)
+++ branches/S2_6/utility/fcthread.h Sun Jan 3 17:35:37 2016
@@ -25,12 +25,15 @@
#include "support.h" /* bool */
-/* No way needed by threading, but if the one including us will ever need it,
it can't be included
- * after we have included <windows.h> directly or indirectly. */
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-
+/* No way needed by threading, but if the one including us will ever need it,
+ * it can't be included after we have included <windows.h> directly or
indirectly. */
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef FREECIV_HAVE_C11_THREADS
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
