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

miss-islington · encukou · web-flow · commit 376e037eccdb · 2025-07-08T11:43:57.000+03:00
Co-authored-by: Petr Viktorin &lt;encukou@gmail.com&gt;
diff --git 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
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -1928,7 +1928,7 @@ wrap_strftime(PyObject object, PyObject format, PyObject *timetuple,`
`1928`	`1928`	`}`
`1929`	`1929`	`replacement = freplacement;`
`1930`	`1930`	`}`
`1931`		`-#ifdef Py_NORMALIZE_CENTURY`
	`1931`	`+#ifdef _Py_NORMALIZE_CENTURY`
`1932`	`1932`	`else if (ch == 'Y' \|\| ch == 'G'`
`1933`	`1933`	`\|\| ch == 'F' \|\| ch == 'C'`
`1934`	`1934`	`) {`