summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/ACKS1
-rw-r--r--Modules/socketmodule.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0a4e02e65a..69dc9f5c0d 100644
--- 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
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 3e1a460703..af6cc94415 100644
--- 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