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