Author: cazfi
Date: Tue Jun 23 18:03:33 2015
New Revision: 29184
URL: http://svn.gna.org/viewcvs/freeciv?rev=29184&view=rev
Log:
Added public FREECIV_HAVE_SYS_TYPES_H to tell if sys/types.h is available
See patch #6094
Modified:
trunk/client/clinet.c
trunk/client/connectdlg_common.c
trunk/client/servers.c
trunk/common/connection.c
trunk/common/connection.h
trunk/common/dataio.c
trunk/common/dataio_json.c
trunk/configure.ac
trunk/gen_headers/freeciv_config.h.in
trunk/server/sernet.c
trunk/server/srv_main.c
trunk/tools/download.c
trunk/utility/netintf.h
trunk/utility/shared.c
trunk/utility/support.c
trunk/utility/support.h
Modified: trunk/client/clinet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/clinet.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/client/clinet.c (original)
+++ trunk/client/clinet.c Tue Jun 23 18:03:33 2015
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/client/connectdlg_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/connectdlg_common.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/client/connectdlg_common.c (original)
+++ trunk/client/connectdlg_common.c Tue Jun 23 18:03:33 2015
@@ -24,7 +24,7 @@
#include <windows.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h> /* fchmod */
#endif
Modified: trunk/client/servers.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/servers.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/client/servers.c (original)
+++ trunk/client/servers.c Tue Jun 23 18:03:33 2015
@@ -18,7 +18,7 @@
#include <errno.h>
#include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/common/connection.c (original)
+++ trunk/common/connection.c Tue Jun 23 18:03:33 2015
@@ -19,7 +19,7 @@
#include <string.h>
#include <time.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SELECT_H
Modified: trunk/common/connection.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.h?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/common/connection.h (original)
+++ trunk/common/connection.h Tue Jun 23 18:03:33 2015
@@ -19,7 +19,7 @@
#include <time.h> /* time_t */
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_TIME_H
Modified: trunk/common/dataio.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/common/dataio.c (original)
+++ trunk/common/dataio.c Tue Jun 23 18:03:33 2015
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/common/dataio_json.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio_json.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/common/dataio_json.c (original)
+++ trunk/common/dataio_json.c Tue Jun 23 18:03:33 2015
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jun 23 18:03:33 2015
@@ -1129,9 +1129,10 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h sys/time.h sys/types.h unistd.h sys/utsname.h \
+AC_CHECK_HEADERS([fcntl.h sys/time.h unistd.h sys/utsname.h \
sys/file.h signal.h strings.h execinfo.h \
libgen.h])
+AC_CHECK_HEADERS([sys/types.h], [AC_DEFINE([FREECIV_HAVE_SYS_TYPES_H], [1],
[sys/types.h available])])
AC_CHECK_HEADERS([locale.h], [AC_DEFINE([FREECIV_HAVE_LOCALE_H], [1],
[locale.h available])])
AC_CHECK_HEADERS([libintl.h], [AC_DEFINE([FREECIV_HAVE_LIBINTL_H], [1],
[libint.h available])])
AC_HEADER_STDBOOL
Modified: trunk/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in (original)
+++ trunk/gen_headers/freeciv_config.h.in Tue Jun 23 18:03:33 2015
@@ -50,6 +50,9 @@
/* stdint.h available */
#undef FREECIV_HAVE_STDINT_H
+/* sys/types.h available */
+#undef FREECIV_HAVE_SYS_TYPES_H
+
/* Have standard compliant stdbool.h */
#undef FREECIV_HAVE_STDBOOL_H
Modified: trunk/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/server/sernet.c (original)
+++ trunk/server/sernet.c Tue Jun 23 18:03:33 2015
@@ -21,7 +21,7 @@
#include <string.h>
#include <time.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Tue Jun 23 18:03:33 2015
@@ -30,7 +30,7 @@
#ifdef HAVE_SYS_TERMIO_H
#include <sys/termio.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_TERMIOS_H
Modified: trunk/tools/download.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/download.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/tools/download.c (original)
+++ trunk/tools/download.c Tue Jun 23 18:03:33 2015
@@ -15,7 +15,7 @@
#include <fc_config.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
Modified: trunk/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.h?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/utility/netintf.h (original)
+++ trunk/utility/netintf.h Tue Jun 23 18:03:33 2015
@@ -34,7 +34,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
Modified: trunk/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/utility/shared.c (original)
+++ trunk/utility/shared.c Tue Jun 23 18:03:33 2015
@@ -15,7 +15,7 @@
#include <fc_config.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
/* Under Mac OS X sys/types.h must be included before dirent.h */
#include <sys/types.h>
#endif
Modified: trunk/utility/support.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/utility/support.c (original)
+++ trunk/utility/support.c Tue Jun 23 18:03:33 2015
@@ -65,7 +65,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
Modified: trunk/utility/support.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.h?rev=29184&r1=29183&r2=29184&view=diff
==============================================================================
--- trunk/utility/support.h (original)
+++ trunk/utility/support.h Tue Jun 23 18:03:33 2015
@@ -32,7 +32,7 @@
#include <stdlib.h> /* size_t */
#include <sys/stat.h>
-#ifdef HAVE_SYS_TYPES_H
+#ifdef FREECIV_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
