Author: cazfi Date: Sun Jan 10 18:16:56 2016 New Revision: 31435 URL: http://svn.gna.org/viewcvs/freeciv?rev=31435&view=rev Log: Added configure check to make sure <direct.h> is available before trying to include it.
See bug #24292 Modified: branches/S2_6/configure.ac branches/S2_6/utility/shared.c Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31435&r1=31434&r2=31435&view=diff ============================================================================== --- branches/S2_6/configure.ac (original) +++ branches/S2_6/configure.ac Sun Jan 10 18:16:56 2016 @@ -180,6 +180,7 @@ AC_DEFINE([FREECIV_HAVE_WINSOCK], [1], [Mingw32-specific setting - winsock]) AC_CHECK_HEADERS([winsock2.h], [AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1], [Mingw32-specific setting - winsock2])]) AC_CHECK_HEADERS([ws2tcpip.h], [AC_DEFINE([FREECIV_HAVE_WS2TCPIP_H], [1], [ws2tcpip.h available])]) + AC_CHECK_HEADERS([direct.h]) dnl Without WINSOCK2, use: LIBS="$LIBS -lwsock32" LIBS="${LIBS} -lws2_32" Modified: branches/S2_6/utility/shared.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=31435&r1=31434&r2=31435&view=diff ============================================================================== --- branches/S2_6/utility/shared.c (original) +++ branches/S2_6/utility/shared.c Sun Jan 10 18:16:56 2016 @@ -51,8 +51,10 @@ #include <windows.h> #include <lmcons.h> /* UNLEN */ #include <shlobj.h> +#ifdef HAVE_DIRECT_H #include <direct.h> -#endif +#endif /* HAVE_DIRECT_H */ +#endif /* WIN32_NATIVE */ /* utility */ #include "astring.h" _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits