diff options
| -rw-r--r-- | Lib/test/test_fileio.py | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 59cc38f6ca..12f2f119b5 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -377,7 +377,7 @@ class OtherFileTests: self.assertEqual(f.writable(), True) if sys.platform != "darwin" and \ 'bsd' not in sys.platform and \ - not sys.platform.startswith('sunos'): + not sys.platform.startswith(('sunos', 'aix')): # Somehow /dev/tty appears seekable on some BSDs self.assertEqual(f.seekable(), False) self.assertEqual(f.isatty(), True) @@ -1308,6 +1308,7 @@ James Rutherford Chris Ryland Bernt Røskar Brenna Constantina S. +Matthieu S Patrick Sabin Sébastien Sablé Amit Saha diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 2620d5673b..c9a38cc24c 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -172,12 +172,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 |