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

Patch by Matthieu S.

diff --git a/Misc/ACKS b/Misc/ACKS
index c6871145683b38eb672178b758517411dde05239..65fd0dc07ab5ae63315b3e1204f2f9d0ae8427b2 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1214,6 +1214,7 @@ Nick Russo
 James Rutherford
 Chris Ryland
 Constantina S.
+Matthieu S
 Patrick Sabin
 Sébastien Sablé
 Suman Saha

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 75e07c1dc894375573ca04d8645e8bb64ff58edd..3e3c05f540794943baa765210ababb80c178353e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -167,12 +167,14 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 #endif
 
 #ifdef HAVE_GETHOSTBYNAME_R
-# if defined(_AIX) || defined(__osf__)
+# if defined(_AIX) && !defined(_LINUX_SOURCE_COMPAT) || defined(__osf__)
 #  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