Author: cazfi
Date: Mon Nov 17 06:01:26 2014
New Revision: 27053

URL: http://svn.gna.org/viewcvs/freeciv?rev=27053&view=rev
Log:
Include locale.h for setlocale() declaration

See bug #22955

Modified:
    branches/S2_4/configure.ac
    branches/S2_4/utility/shared.c

Modified: branches/S2_4/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/configure.ac?rev=27053&r1=27052&r2=27053&view=diff
==============================================================================
--- branches/S2_4/configure.ac  (original)
+++ branches/S2_4/configure.ac  Mon Nov 17 06:01:26 2014
@@ -988,7 +988,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_4/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/utility/shared.c?rev=27053&r1=27052&r2=27053&view=diff
==============================================================================
--- branches/S2_4/utility/shared.c      (original)
+++ branches/S2_4/utility/shared.c      Mon Nov 17 06:01:26 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

Reply via email to