Author: cazfi
Date: Sun Aug 14 23:06:00 2016
New Revision: 33595
URL: http://svn.gna.org/viewcvs/freeciv?rev=33595&view=rev
Log:
Corrected ioctlsocket() call parameter type on win64 compile.
See bug #24900
Modified:
branches/S2_5/utility/netintf.c
Modified: branches/S2_5/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/netintf.c?rev=33595&r1=33594&r2=33595&view=diff
==============================================================================
--- branches/S2_5/utility/netintf.c (original)
+++ branches/S2_5/utility/netintf.c Sun Aug 14 23:06:00 2016
@@ -228,7 +228,12 @@
{
#ifdef NONBLOCKING_SOCKETS
#ifdef HAVE_WINSOCK
- unsigned long b = 1;
+#ifdef __LP64__
+ unsigned b = 1;
+#else /* __LP64__ */
+ u_long b = 1;
+#endif /* __LP64__ */
+
ioctlsocket(sockfd, FIONBIO, &b);
#else /* HAVE_WINSOCK */
#ifdef HAVE_FCNTL
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
