Commit 77bb5365 authored by Yang Tse's avatar Yang Tse
Browse files

fIX *__SOCKLEN_T definitions for OS400 and generic GCC targets

parent 7c6e0d59

ares/ares_build.h.dist

+8 −4
Original line number Original line Diff line number Diff line
@@ -168,6 +168,10 @@ 
#    define CARES_SIZEOF_LONG           4

#    define CARES_SIZEOF_LONG           4

#    define CARES_TYPEOF_ARES_SOCKLEN_T FIXME

#    define CARES_TYPEOF_ARES_SOCKLEN_T FIXME

#    define CARES_SIZEOF_ARES_SOCKLEN_T -1

#    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

#  endif





#elif defined(__MVS__)

#elif defined(__MVS__)
@@ -217,13 +221,13 @@ 
#elif defined(__GNUC__)

#elif defined(__GNUC__)

#  if defined(__i386__) || defined(__ppc__)

#  if defined(__i386__) || defined(__ppc__)

#    define CARES_SIZEOF_LONG           4

#    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__)

#  elif defined(__x86_64__) || defined(__ppc64__)

#    define CARES_SIZEOF_LONG           8

#    define CARES_SIZEOF_LONG           8

#    define CARES_TYPEOF_ARES_SOCKLEN_T FIXME

#    define CARES_SIZEOF_ARES_SOCKLEN_T -1

#  endif

#  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

#else

#  error "Unknown non-configure build target!"

#  error "Unknown non-configure build target!"

include/curl/curlbuild.h.dist

+8 −4
Original line number Original line Diff line number Diff line
@@ -402,9 +402,11 @@ 
#    define CURL_SIZEOF_CURL_OFF_T     8

#    define CURL_SIZEOF_CURL_OFF_T     8

#    define CURL_SUFFIX_CURL_OFF_T     LL

#    define CURL_SUFFIX_CURL_OFF_T     LL

#    define CURL_SUFFIX_CURL_OFF_TU    ULL

#    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

#  endif

#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME

#  define CURL_SIZEOF_CURL_SOCKLEN_T -1





#elif defined(__MVS__)

#elif defined(__MVS__)

#  if defined(__IBMC__) || defined(__IBMCPP__)

#  if defined(__IBMC__) || defined(__IBMCPP__)
@@ -545,8 +547,10 @@ 
#    define CURL_SUFFIX_CURL_OFF_T     L

#    define CURL_SUFFIX_CURL_OFF_T     L

#    define CURL_SUFFIX_CURL_OFF_TU    UL

#    define CURL_SUFFIX_CURL_OFF_TU    UL

#  endif

#  endif

#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME

#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t

#  define CURL_SIZEOF_CURL_SOCKLEN_T -1

#  define CURL_SIZEOF_CURL_SOCKLEN_T 4

#  define CURL_PULL_SYS_TYPES_H      1

#  define CURL_PULL_SYS_SOCKET_H     1





#else

#else

#  error "Unknown non-configure build target!"

#  error "Unknown non-configure build target!"