[3.14] gh-120713: Make _Py_NORMALIZE_CENTURY private (GH-135933) (#136387)

Co-authored-by: Petr Viktorin <encukou@gmail.com>

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 9bba0e3354b26ba7c9144ff7b6b064d03866fdeb..f5a9712b64e4deab5d8b48713f415159a0881dec 100644 (file)
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1928,7 +1928,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
             }
             replacement = freplacement;
         }
-#ifdef Py_NORMALIZE_CENTURY
+#ifdef _Py_NORMALIZE_CENTURY
         else if (ch == 'Y' || ch == 'G'
                  || ch == 'F' || ch == 'C'
         ) {

diff --git a/configure b/configure
index a9257ac0b3ac30772382cd664804501de89bbf63..1646efe5f061ca9d4401c25d75350fd1535f0aa6 100755 (executable)
--- a/configure
+++ b/configure
@@ -28234,7 +28234,7 @@ printf "%s\n" "$ac_cv_normalize_century" >&6; }
 if test "$ac_cv_normalize_century" = yes
 then
 
-printf "%s\n" "#define Py_NORMALIZE_CENTURY 1" >>confdefs.h
+printf "%s\n" "#define _Py_NORMALIZE_CENTURY 1" >>confdefs.h
 
 fi
 

diff --git a/configure.ac b/configure.ac
index 225dfc79ab5b29ebdcf832cbf6e49700e7344f02..d868f7b26bad1cebddcde41825c9a57e7fc01bae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6813,7 +6813,7 @@ int main(void)
 [ac_cv_normalize_century=yes])])
 if test "$ac_cv_normalize_century" = yes
 then
-  AC_DEFINE([Py_NORMALIZE_CENTURY], [1],
+  AC_DEFINE([_Py_NORMALIZE_CENTURY], [1],
   [Define if year with century should be normalized for strftime.])
 fi
 

diff --git a/pyconfig.h.in b/pyconfig.h.in
index d7c496fccc682cd8d5952948d16acdef929f14af..1c533b2bfb7fb4d4bad396ba74b9e08f158b8b1d 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1737,9 +1737,6 @@
    SipHash13: 3, externally defined: 0 */
 #undef Py_HASH_ALGORITHM
 
-/* Define if year with century should be normalized for strftime. */
-#undef Py_NORMALIZE_CENTURY
-
 /* Define if you want to enable remote debugging support. */
 #undef Py_REMOTE_DEBUG
 
@@ -2026,6 +2023,9 @@
 /* HACL* library can compile SIMD256 implementations */
 #undef _Py_HACL_CAN_COMPILE_VEC256
 
+/* Define if year with century should be normalized for strftime. */
+#undef _Py_NORMALIZE_CENTURY
+
 /* Define to force use of thread-safe errno, h_errno, and other functions */
 #undef _REENTRANT