Issue #6183: Disables wcsftime on VC6.

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index d524ac549aa0b4fd5efaaba5c337e2a8a661b323..d8db4095701bcbc29aa6473c58fd4cfeadc47f6e 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -540,7 +540,7 @@ time_strftime(PyObject *self, PyObject *args)
        fmt = PyBytes_AS_STRING(format);
 #endif
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) && defined(HAVE_WCSFTIME)
        /* check that the format string contains only valid directives */
        for(outbuf = wcschr(fmt, L'%');
                outbuf != NULL;

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index d76846fe403150284864b991c5aea78e992618ed..3c3c6f49eb77e7b6ecff476d85038ecbd816965c 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -638,7 +638,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* #undef HAVE_WAITPID */
 
 /* Define to 1 if you have the `wcsftime' function. */
+#if defined(_MSC_VER) && _MSC_VER >= 1310
 #define HAVE_WCSFTIME 1
+#endif
 
 /* Define to 1 if you have the `wcscoll' function. */
 #ifndef MS_WINCE