diff options
| -rw-r--r-- | Modules/timemodule.c | 4 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index ad28e58..89a41ce 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -515,14 +515,18 @@ time_strftime(PyObject *self, PyObject *args) * will be ahead of time... */ for (i = 1024; ; i += i) { +#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) int err; +#endif outbuf = (time_char *)PyMem_Malloc(i*sizeof(time_char)); if (outbuf == NULL) { PyErr_NoMemory(); break; } buflen = format_time(outbuf, i, fmt, &buf); +#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) err = errno; +#endif if (buflen > 0 || i >= 256 * fmtlen) { /* If the buffer is 256 times as long as the format, it's probably not failing for lack of room! diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 3f70af7..f5f1c46 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4832,7 +4832,7 @@ PyUnicode_DecodeUTF8Stateful(const char *s, if (maxchar < 128 && size == unicode_size) { if (consumed) *consumed = size; - return unicode_fromascii(s, size); + return unicode_fromascii((const unsigned char *)s, size); } unicode = PyUnicode_New(unicode_size, maxchar); |