aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/ares_build.h.dist28
-rw-r--r--include/curl/curlbuild.h.dist24
2 files changed, 40 insertions, 12 deletions
diff --git a/ares/ares_build.h.dist b/ares/ares_build.h.dist
index 9f32c8f26..d88a65cda 100644
--- a/ares/ares_build.h.dist
+++ b/ares/ares_build.h.dist
@@ -174,26 +174,26 @@
# if defined(__IBMC__) || defined(__IBMCPP__)
# if defined(_ILP32)
# define CARES_SIZEOF_LONG 4
-# define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-# define CARES_SIZEOF_ARES_SOCKLEN_T -1
# elif defined(_LP64)
# define CARES_SIZEOF_LONG 8
-# define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-# define CARES_SIZEOF_ARES_SOCKLEN_T -1
# endif
+# define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
+# define CARES_SIZEOF_ARES_SOCKLEN_T 4
+# define CARES_PULL_SYS_TYPES_H 1
+# define CARES_PULL_SYS_SOCKET_H 1
# endif
#elif defined(__370__)
# if defined(__IBMC__) || defined(__IBMCPP__)
# if defined(_ILP32)
# define CARES_SIZEOF_LONG 4
-# define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-# define CARES_SIZEOF_ARES_SOCKLEN_T -1
# elif defined(_LP64)
# define CARES_SIZEOF_LONG 8
-# define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-# define CARES_SIZEOF_ARES_SOCKLEN_T -1
# endif
+# define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
+# define CARES_SIZEOF_ARES_SOCKLEN_T 4
+# define CARES_PULL_SYS_TYPES_H 1
+# define CARES_PULL_SYS_SOCKET_H 1
# endif
#elif defined(TPF)
@@ -230,6 +230,18 @@
Error Compilation_aborted_Unknown_non_configure_build_target
#endif
+/* CARES_PULL_SYS_TYPES_H is defined above when inclusion of header file */
+/* sys/types.h is required here to properly make type definitions below. */
+#ifdef CARES_PULL_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+/* CARES_PULL_SYS_SOCKET_H is defined above when inclusion of header file */
+/* sys/socket.h is required here to properly make type definitions below. */
+#ifdef CARES_PULL_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
/* Data type definition of ares_socklen_t. */
#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index 3f55979c6..ba077925e 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -438,9 +438,11 @@
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# endif
+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+# define CURL_SIZEOF_CURL_SOCKLEN_T 4
+# define CURL_PULL_SYS_TYPES_H 1
+# define CURL_PULL_SYS_SOCKET_H 1
# endif
-# define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-# define CURL_SIZEOF_CURL_SOCKLEN_T -1
#elif defined(__370__)
# if defined(__IBMC__) || defined(__IBMCPP__)
@@ -474,9 +476,11 @@
# define CURL_SUFFIX_CURL_OFF_T L
# define CURL_SUFFIX_CURL_OFF_TU UL
# endif
+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+# define CURL_SIZEOF_CURL_SOCKLEN_T 4
+# define CURL_PULL_SYS_TYPES_H 1
+# define CURL_PULL_SYS_SOCKET_H 1
# endif
-# define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-# define CURL_SIZEOF_CURL_SOCKLEN_T -1
#elif defined(TPF)
# define CURL_SIZEOF_LONG 8
@@ -549,6 +553,18 @@
Error Compilation_aborted_Unknown_non_configure_build_target
#endif
+/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */
+/* sys/types.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */
+/* sys/socket.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
/* Data type definition of curl_socklen_t. */
#ifdef CURL_TYPEOF_CURL_SOCKLEN_T