diff options
| author | Brett Cannon <brett@python.org> | 2013-06-18 20:51:42 -0400 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-06-18 20:51:42 -0400 |
| commit | aa3ca7e0f2c64af85516102e17271d74af9b03e2 (patch) | |
| tree | c99d9944040723708df30b468f1973ff2b25d84f | |
| parent | 89df7b4e64917b9dba7a50bc4bfe789d6adb56f3 (diff) | |
| parent | 262e7f389ca5381fd00938f0c38050c8eab55273 (diff) | |
| download | cpython-git-aa3ca7e0f2c64af85516102e17271d74af9b03e2.tar.gz | |
merge
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi/src/powerpc/ffi.c | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 5 |
3 files changed, 10 insertions, 1 deletions
@@ -123,6 +123,8 @@ Core and Builtins 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 index 54f2731b6b..5381d3d10d 100644 --- a/Modules/_ctypes/libffi/src/powerpc/ffi.c +++ b/Modules/_ctypes/libffi/src/powerpc/ffi.c @@ -146,12 +146,14 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack) } 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 index 46265ade89..8bd098f4e1 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4066,6 +4066,11 @@ socket_sethostname(PyObject *self, PyObject *args) 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", |