mirror of https://github.com/python/cpython
merge
This commit is contained in:
commit
aa3ca7e0f2
|
@ -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.
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue