From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 14 Nov 2016 05:04:12 +0000 (+0000)
Subject: Merge AIX fixes from 3.5 into 3.6
X-Git-Tag: v3.6.0b4~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8cebad2901799ebfceb3228a7ba69a504e21f75;p=thirdparty%2FPython%2Fcpython.git

Merge AIX fixes from 3.5 into 3.6
---

f8cebad2901799ebfceb3228a7ba69a504e21f75
diff --cc Misc/ACKS
index 508f0c5311bc,69dc9f5c0dff..2719cb9c97f8
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1308,9 -1290,9 +1308,10 @@@ James Rutherfor
  Chris Ryland
  Bernt Røskar Brenna
  Constantina S.
+ Matthieu S
  Patrick Sabin
  Sébastien Sablé
 +Amit Saha
  Suman Saha
  Hajime Saitou
  George Sakkis
diff --cc Modules/socketmodule.c
index 2620d5673bd3,af6cc94415b6..c9a38cc24c99
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@@ -176,8 -172,10 +176,10 @@@ if_indextoname(index) -- return the cor
  #  define HAVE_GETHOSTBYNAME_R_3_ARG
  # elif defined(__sun) || defined(__sgi)
  #  define HAVE_GETHOSTBYNAME_R_5_ARG
 -# elif defined(linux)
 +# 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