Merge AIX fixes from 3.5 into 3.6

diff --cc Misc/ACKS
index 508f0c5311bc794b68733cac85ef424ccec19f1d,69dc9f5c0dffb4c2ab0dd19b4e46b6fe7b509432..2719cb9c97f8033a5419ac3097b4ea3b6483acbd
--- 1/Misc/ACKS
--- 2/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 2620d5673bd37963740030d713a75ba3e28cd6fb,af6cc94415b6869d0b37e22bd6cc2d5b514348b0..c9a38cc24c998508b2ef86fa3382a15fb351ff9d
--- 1/Modules/socketmodule.c
--- 2/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