diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-06-03 05:19:18 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-06-03 05:19:18 (GMT) |
| commit | 6b0e51a08c66e5b4da4c1cc1fe35f99efa102cdc (patch) | |
| tree | d3ac7700e8c6f108a3b5c3bf5691b8a0d3e8edf5 | |
| parent | 3db5e7be1cf61756e89c40efcc1e24f00f33425b (diff) | |
| download | cpython-6b0e51a08c66e5b4da4c1cc1fe35f99efa102cdc.zip cpython-6b0e51a08c66e5b4da4c1cc1fe35f99efa102cdc.tar.gz cpython-6b0e51a08c66e5b4da4c1cc1fe35f99efa102cdc.tar.bz2 | |
Issue #6183: Disables wcsftime on VC6.
| -rw-r--r-- | Modules/timemodule.c | 2 | ||||
| -rw-r--r-- | PC/pyconfig.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index d524ac5..d8db409 100644 --- 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 d76846f..3c3c6f4 100644 --- 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 |