Use _Py_ prefix on new define.

Author: nascheme

Modules/timemodule.c

@@ -1854,7 +1854,7 @@ time_get_clock_info_impl(PyObject *module, const char *name)
     return NULL;
 }
 
-#ifndef HAVE_TIMEZONE_GLOBALS
+#ifndef _Py_HAVE_TIMEZONE_GLOBALS
 static void
 get_zone(char *zone, int n, struct tm *p)
 {
@@ -1875,7 +1875,7 @@ get_gmtoff(time_t t, struct tm *p)
     return timegm(p) - t;
 #endif
 }
-#endif // !HAVE_TIMEZONE_GLOBALS
+#endif // !_Py_HAVE_TIMEZONE_GLOBALS
 
 static int
 init_timezone(PyObject *m)
@@ -1904,7 +1904,7 @@ init_timezone(PyObject *m)
 
     And I'm lazy and hate C so nyer.
      */
-#ifdef HAVE_TIMEZONE_GLOBALS
+#ifdef _Py_HAVE_TIMEZONE_GLOBALS
     PyObject *otz0, *otz1;
 #if !defined(MS_WINDOWS) || defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)
     tzset();
@@ -1944,7 +1944,7 @@ init_timezone(PyObject *m)
     if (PyModule_Add(m, "tzname", Py_BuildValue("(NN)", otz0, otz1)) < 0) {
         return -1;
     }
-#else // !HAVE_TIMEZONE_GLOBALS
+#else // !_Py_HAVE_TIMEZONE_GLOBALS
     static const time_t YEAR = (365 * 24 + 6) * 3600;
     time_t t;
     struct tm p;
@@ -1989,7 +1989,7 @@ init_timezone(PyObject *m)
     if (PyModule_Add(m, "tzname", tzname_obj) < 0) {
         return -1;
     }
-#endif // !HAVE_TIMEZONE_GLOBALS
+#endif // !_Py_HAVE_TIMEZONE_GLOBALS
 #undef ADD_INT
 
     if (PyErr_Occurred()) {

PC/pyconfig.h

@@ -430,7 +430,7 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 #define HAVE_DIRECT_H 1
 
 /* Define if time.h declares the timezone, daylight and tzname variables. */
-#define HAVE_TIMEZONE_GLOBALS 1
+#define _Py_HAVE_TIMEZONE_GLOBALS 1
 
 /* Define if you have dirent.h.  */
 /* #define DIRENT 1 */

configure

@@ -6557,7 +6557,7 @@ AC_CACHE_CHECK([for time.h that defines timezone, daylight and tzname variables]
     [ac_cv_header_time_tz_globals=no])
   ])
 if test $ac_cv_header_time_tz_globals = yes; then
-  AC_DEFINE([HAVE_TIMEZONE_GLOBALS], [1],
+  AC_DEFINE([_Py_HAVE_TIMEZONE_GLOBALS], [1],
     [Define if time.h declares the timezone, daylight and tzname variables.])
 fi
 

configure.ac

@@ -1622,9 +1622,6 @@
 /* Define to 1 if you have the 'times' function. */
 #undef HAVE_TIMES
 
-/* Define if time.h declares the timezone, daylight and tzname variables. */
-#undef HAVE_TIMEZONE_GLOBALS
-
 /* Define to 1 if you have the 'tmpfile' function. */
 #undef HAVE_TMPFILE
 
@@ -2177,6 +2174,9 @@
 /* Define if you have the 'tanpi' function. */
 #undef _Py_HAVE_TANPI
 
+/* Define if time.h declares the timezone, daylight and tzname variables. */
+#undef _Py_HAVE_TIMEZONE_GLOBALS
+
 /* Thread stack size set by the linker (in bytes). */
 #undef _Py_LINKER_THREAD_STACK_SIZE