Changeset 1538

Timestamp:

Dec 21, 2018, 6:53:57 PM (7 years ago)

Author:

Silvan Scherrer

Message:

adjust getaddrinfo and friends to latest libcx

Location:

python/trunk

Files:

• Modules/socketmodule.h (modified) (1 diff)
• configure.ac (modified) (6 diffs)

python/trunk/Modules/socketmodule.h

@@ -12 +12 @@
 #  include <netinet/tcp.h>
 # endif
+#ifdef __OS2__
+#include <libcx/net.h>
+#endif
 
 #else /* MS_WINDOWS */

python/trunk/configure.ac

@@ -3249 +3249 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
+#ifdef __OS2__
+#include <libcx/net.h>
+#endif
 
 int main()
@@ -3254 +3257 @@
   int passive, gaierr, inet4 = 0, inet6 = 0;
   struct addrinfo hints, *ai, *aitop;
+#ifndef __OS2__
   char straddr[INET6_ADDRSTRLEN], strport[16];
+#else
+  char straddr[NI_MAXHOST], strport[NI_MAXSERV];
+#endif
 
   for (passive = 0; passive <= 1; passive++) {
@@ -3290 +3297 @@
         inet4++;
         break;
+#ifndef __OS2__
       case AF_INET6:
         if (strcmp(strport, "54321") != 0) {
@@ -3305 +3313 @@
         inet6++;
         break;
+#endif
       case AF_UNSPEC:
         goto bad;
@@ -3394 +3403 @@
 AC_MSG_CHECKING(for addrinfo)
 AC_CACHE_VAL(ac_cv_struct_addrinfo,
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo a]])],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  #include <netdb.h>
+  #ifdef __OS2__
+  #include <libcx/net.h>
+  #endif
+  ]], [[struct addrinfo a]])],
   [ac_cv_struct_addrinfo=yes],
   [ac_cv_struct_addrinfo=no]))
@@ -4519 +4533 @@
 #include <sys/socket.h>
 #endif
+#ifdef __OS2__
+#include <libcx/net.h>
+#endif
 ])