Issue #28000: Fix gethostbyname_r() usage on AIX with _LINUX_SOURCE_COMPAT

Patch by Matthieu S.

Issue #28000: Fix gethostbyname_r() usage on AIX with _LINUX_SOURCE_COMPAT
Patch by Matthieu S.
b8ccbafa · Martin Panter · eb33be15 · b8ccbafa · b8ccbafa
Commit b8ccbafa authored Nov 14, 2016 by Martin Panter
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Misc/ACKS Misc/ACKS +1 -0

Modules/socketmodule.c Modules/socketmodule.c +3 -1

No files found.
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1290,6 +1290,7 @@ James Rutherford
 Chris Ryland
 Bernt Røskar Brenna
 Constantina S.
+Matthieu S
 Patrick Sabin
 Sébastien Sablé
 Suman Saha

--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -168,12 +168,14 @@ if_indextoname(index) -- return the corresponding interface name\n\
 #endif
 #ifdef HAVE_GETHOSTBYNAME_R
-# if defined(_AIX)
+# if defined(_AIX) && !defined(_LINUX_SOURCE_COMPAT)
 #  define HAVE_GETHOSTBYNAME_R_3_ARG
 # elif defined(__sun) || defined(__sgi)
 #  define HAVE_GETHOSTBYNAME_R_5_ARG
 # elif defined(linux)
 /* Rely on the configure script */
+# elif defined(_LINUX_SOURCE_COMPAT) /* Linux compatibility on AIX */
+#  define HAVE_GETHOSTBYNAME_R_6_ARG
 # else
 #  undef HAVE_GETHOSTBYNAME_R
 # endif