From: Christian Heimes Date: Fri, 19 Aug 2022 06:08:43 +0000 (+0200) Subject: gh-96017: Fix some compiler warnings (GH-96018) X-Git-Tag: v3.12.0a1~611 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9c1b746b5013f81d1724757bb3c6a1c87c4a8dc;p=thirdparty%2FPython%2Fcpython.git gh-96017: Fix some compiler warnings (GH-96018) - "comparison of integers of different signs" in typeobject.c - only define static_builtin_index_is_set in DEBUG builds - only define recreate_gil with ifdef HAVE_FORK --- diff --git a/Objects/typeobject.c b/Objects/typeobject.c index e8c36cf15399..e61acd295ac4 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -70,11 +70,13 @@ static inline PyTypeObject * subclass_from_ref(PyObject *ref); /* helpers for for static builtin types */ +#ifndef NDEBUG static inline int static_builtin_index_is_set(PyTypeObject *self) { return self->tp_subclasses != NULL; } +#endif static inline size_t static_builtin_index_get(PyTypeObject *self) diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h index 1b2dc7f8e1dc..4c71edd682bf 100644 --- a/Python/ceval_gil.h +++ b/Python/ceval_gil.h @@ -133,12 +133,14 @@ static void destroy_gil(struct _gil_runtime_state *gil) _Py_ANNOTATE_RWLOCK_DESTROY(&gil->locked); } +#ifdef HAVE_FORK static void recreate_gil(struct _gil_runtime_state *gil) { _Py_ANNOTATE_RWLOCK_DESTROY(&gil->locked); /* XXX should we destroy the old OS resources here? */ create_gil(gil); } +#endif static void drop_gil(struct _ceval_runtime_state *ceval, struct _ceval_state *ceval2,