Author: cazfi
Date: Tue Jun 23 18:03:43 2015
New Revision: 29185

URL: http://svn.gna.org/viewcvs/freeciv?rev=29185&view=rev
Log:
Added public FREECIV_HAVE_SYS_TYPES_H to tell if sys/types.h is available

See patch #6094

Modified:
    branches/S2_6/client/clinet.c
    branches/S2_6/client/connectdlg_common.c
    branches/S2_6/client/servers.c
    branches/S2_6/common/connection.c
    branches/S2_6/common/connection.h
    branches/S2_6/common/dataio.c
    branches/S2_6/configure.ac
    branches/S2_6/gen_headers/freeciv_config.h.in
    branches/S2_6/server/sernet.c
    branches/S2_6/server/srv_main.c
    branches/S2_6/tools/download.c
    branches/S2_6/utility/netintf.h
    branches/S2_6/utility/shared.c
    branches/S2_6/utility/support.c
    branches/S2_6/utility/support.h

Modified: branches/S2_6/client/clinet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/client/clinet.c       (original)
+++ branches/S2_6/client/clinet.c       Tue Jun 23 18:03:43 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: branches/S2_6/client/connectdlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/connectdlg_common.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/client/connectdlg_common.c    (original)
+++ branches/S2_6/client/connectdlg_common.c    Tue Jun 23 18:03:43 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: branches/S2_6/client/servers.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/servers.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/client/servers.c      (original)
+++ branches/S2_6/client/servers.c      Tue Jun 23 18:03:43 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: branches/S2_6/common/connection.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/common/connection.c   (original)
+++ branches/S2_6/common/connection.c   Tue Jun 23 18:03:43 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: branches/S2_6/common/connection.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.h?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/common/connection.h   (original)
+++ branches/S2_6/common/connection.h   Tue Jun 23 18:03:43 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: branches/S2_6/common/dataio.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/dataio.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/common/dataio.c       (original)
+++ branches/S2_6/common/dataio.c       Tue Jun 23 18:03:43 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: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Tue Jun 23 18:03:43 2015
@@ -1077,9 +1077,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: branches/S2_6/gen_headers/freeciv_config.h.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in       (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in       Tue Jun 23 18:03:43 2015
@@ -47,6 +47,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: branches/S2_6/server/sernet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/sernet.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/server/sernet.c       (original)
+++ branches/S2_6/server/sernet.c       Tue Jun 23 18:03:43 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: branches/S2_6/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c     (original)
+++ branches/S2_6/server/srv_main.c     Tue Jun 23 18:03:43 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: branches/S2_6/tools/download.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/download.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/tools/download.c      (original)
+++ branches/S2_6/tools/download.c      Tue Jun 23 18:03:43 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: branches/S2_6/utility/netintf.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.h?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.h     (original)
+++ branches/S2_6/utility/netintf.h     Tue Jun 23 18:03:43 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: branches/S2_6/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/utility/shared.c      (original)
+++ branches/S2_6/utility/shared.c      Tue Jun 23 18:03:43 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: branches/S2_6/utility/support.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.c?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/utility/support.c     (original)
+++ branches/S2_6/utility/support.c     Tue Jun 23 18:03:43 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: branches/S2_6/utility/support.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.h?rev=29185&r1=29184&r2=29185&view=diff
==============================================================================
--- branches/S2_6/utility/support.h     (original)
+++ branches/S2_6/utility/support.h     Tue Jun 23 18:03:43 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

Reply via email to