Author: cazfi
Date: Mon Nov 17 06:01:19 2014
New Revision: 27052
URL: http://svn.gna.org/viewcvs/freeciv?rev=27052&view=rev
Log:
Include locale.h for setlocale() declaration
See bug #22955
Modified:
branches/S2_5/configure.ac
branches/S2_5/utility/shared.c
Modified: branches/S2_5/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- branches/S2_5/configure.ac (original)
+++ branches/S2_5/configure.ac Mon Nov 17 06:01:19 2014
@@ -1106,7 +1106,7 @@
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([fcntl.h sys/time.h sys/types.h unistd.h sys/utsname.h \
sys/file.h libintl.h signal.h strings.h execinfo.h \
- libgen.h])
+ libgen.h locale.h])
AC_HEADER_STDBOOL
dnl Avoid including the unix emulation layer if we build mingw executables
dnl There would be type conflicts between winsock and bsd/unix includes
Modified: branches/S2_5/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/shared.c?rev=27052&r1=27051&r2=27052&view=diff
==============================================================================
--- branches/S2_5/utility/shared.c (original)
+++ branches/S2_5/utility/shared.c Mon Nov 17 06:01:19 2014
@@ -29,6 +29,10 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
