fIX *__SOCKLEN_T definitions for OS400 and generic GCC targets

diff --git a/ares/ares_build.h.dist b/ares/ares_build.h.dist
index d88a65cdab61ff3dbd45fbae82449357fc6845a0..462be557abb9f67ef8b05be34b96923a7a07d8b7 100644 (file)
--- a/ares/ares_build.h.dist
+++ b/ares/ares_build.h.dist
@@ -168,6 +168,10 @@
 #    define CARES_SIZEOF_LONG           4
 #    define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
 #    define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#    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(__MVS__)
@@ -217,13 +221,13 @@
 #elif defined(__GNUC__)
 #  if defined(__i386__) || defined(__ppc__)
 #    define CARES_SIZEOF_LONG           4
-#    define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#    define CARES_SIZEOF_ARES_SOCKLEN_T -1
 #  elif defined(__x86_64__) || defined(__ppc64__)
 #    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
 
 #else
 #  error "Unknown non-configure build target!"

diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index ba077925e5e07ba3282e75d0f94a388790f7ab4c..8b4360daab0d4730e99dadb73423360f09744f89 100644 (file)
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -402,9 +402,11 @@
 #    define CURL_SIZEOF_CURL_OFF_T     8
 #    define CURL_SUFFIX_CURL_OFF_T     LL
 #    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    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(__MVS__)
 #  if defined(__IBMC__) || defined(__IBMCPP__)
@@ -545,8 +547,10 @@
 #    define CURL_SUFFIX_CURL_OFF_T     L
 #    define CURL_SUFFIX_CURL_OFF_TU    UL
 #  endif
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  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
 
 #else
 #  error "Unknown non-configure build target!"