diff options
| -rw-r--r-- | Modules/_io/bufferedio.c | 2 | ||||
| -rw-r--r-- | Modules/getnameinfo.c | 3 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 7 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 2 | ||||
| -rw-r--r-- | Objects/stringlib/fastsearch.h | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
7 files changed, 12 insertions, 8 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index ac30d1d..4a4a199 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -328,7 +328,7 @@ _enter_buffered_busy(buffered *self) : buffered_closed(self))) #define CHECK_CLOSED(self, error_msg) \ - if (IS_CLOSED(self) & (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \ + if (IS_CLOSED(self) && (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \ PyErr_SetString(PyExc_ValueError, error_msg); \ return NULL; \ } \ diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c index f014c11..db3e8ee 100644 --- a/Modules/getnameinfo.c +++ b/Modules/getnameinfo.c @@ -104,8 +104,8 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) u_long v4a; #ifdef ENABLE_IPV6 u_char pfx; -#endif int h_error; +#endif char numserv[512]; char numaddr[512]; @@ -181,7 +181,6 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error); #else hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af); - h_error = h_errno; #endif if (hp) { diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index dfb1f92..e3b37f1 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -189,8 +189,8 @@ compare_handler(PyObject *func, PyObject *dfl_ign_handler) return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1; } -#ifdef HAVE_GETITIMER -/* auxiliary functions for setitimer */ +#ifdef HAVE_SETITIMER +/* auxiliary function for setitimer */ static int timeval_from_double(PyObject *obj, struct timeval *tv) { @@ -206,7 +206,10 @@ timeval_from_double(PyObject *obj, struct timeval *tv) } return _PyTime_AsTimeval(t, tv, _PyTime_ROUND_CEILING); } +#endif +#if defined(HAVE_SETITIMER) || defined(HAVE_GETITIMER) +/* auxiliary functions for get/setitimer */ Py_LOCAL_INLINE(double) double_from_timeval(struct timeval *tv) { diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9aefa44..461096c 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1013,6 +1013,7 @@ init_sockobject(PySocketSockObject *s, } +#ifdef HAVE_SOCKETPAIR /* Create a new socket object. This just creates the object and initializes it. If the creation fails, return NULL and set an exception (implicit @@ -1032,6 +1033,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto) } return s; } +#endif /* Lock to allow python interpreter to continue, but only allow one diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index b91082b..7403d8a 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -345,7 +345,7 @@ STRINGLIB(_preprocess)(const STRINGLIB_CHAR *needle, Py_ssize_t len_needle, } // Fill up a compressed Boyer-Moore "Bad Character" table Py_ssize_t not_found_shift = Py_MIN(len_needle, MAX_SHIFT); - for (Py_ssize_t i = 0; i < TABLE_SIZE; i++) { + for (Py_ssize_t i = 0; i < (Py_ssize_t)TABLE_SIZE; i++) { p->table[i] = Py_SAFE_DOWNCAST(not_found_shift, Py_ssize_t, SHIFT_TYPE); } @@ -24763,7 +24763,7 @@ $as_echo_n "checking for stdlib extension module _ctypes_test... " >&6; } if test "$py_cv_module__ctypes_test" != "n/a"; then : if test "$TEST_MODULES" = yes; then : - if true; then : + if test "$ac_cv_func_dlopen" = yes; then : py_cv_module__ctypes_test=yes else py_cv_module__ctypes_test=missing diff --git a/configure.ac b/configure.ac index 9bcb381..97ee28f 100644 --- a/configure.ac +++ b/configure.ac @@ -6977,7 +6977,7 @@ PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) -PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [], [], [-lm]) +PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes], [], [-lm]) dnl Limited API template modules. dnl The limited C API is not compatible with the Py_TRACE_REFS macro. |