Commit 760ab73d authored by Martin Panter's avatar Martin Panter

Merge AIX fixes from 3.5 into 3.6

parents 03628b01 b8ccbafa
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment