[Python-checkins] cpython (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/338be75f11c1
changeset:   84216:338be75f11c1
parent:      84215:ded443c603f0
parent:      84214:1638f28f3b2f
user:        Brett Cannon <brett at python.org>
date:        Tue Jun 18 20:51:42 2013 -0400
summary:
  merge

files:
  Misc/NEWS                                |  2 ++
  Modules/_ctypes/libffi/src/powerpc/ffi.c |  4 +++-
  Modules/socketmodule.c                   |  5 +++++
  3 files changed, 10 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@
 Library
 -------
 
+- Issue #18259: Declare sethostname in socketmodule.c for AIX
+
 - Issue #18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list()
   lists all loaded CA certificates and cert_store_stats() returns amount of
   loaded X.509 certs, X.509 CA certs and CRLs.
diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi.c b/Modules/_ctypes/libffi/src/powerpc/ffi.c
--- a/Modules/_ctypes/libffi/src/powerpc/ffi.c
+++ b/Modules/_ctypes/libffi/src/powerpc/ffi.c
@@ -146,12 +146,14 @@
   } p_argv;
   size_t struct_copy_size;
   unsigned gprvalue;
+#ifndef __NO_FPRS__
+  double double_tmp;
+#endif
 
   stacktop.c = (char *) stack + bytes;
   gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS;
   intarg_count = 0;
 #ifndef __NO_FPRS__
-  double double_tmp;
   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS;
   fparg_count = 0;
   copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c);
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4066,6 +4066,11 @@
     Py_buffer buf;
     int res, flag = 0;
 
+#ifdef _AIX
+/* issue #18259, not declared in any useful header file */
+extern int sethostname(const char *, size_t);
+#endif
+
     if (!PyArg_ParseTuple(args, "S:sethostname", &hnobj)) {
         PyErr_Clear();
         if (!PyArg_ParseTuple(args, "O&:sethostname",

-- 
Repository URL: http://hg.python.org/cpython