[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: Thanks, Zackery! -- assignee: -> steve.dower resolution: -> fixed stage: patch review -> resolved status: open -> closed ___ Python tracker

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

miss-islington added the comment: New changeset 0b3019a02e60171e9b7edb261e1234109001819c by Miss Islington (bot) in branch '3.7': bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (GH-12019) https://github.com/python/cpython/commit/0b3019a02e60171e9b7edb261e1234109001819c

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Change by miss-islington : -- pull_requests: +12066 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe:

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: New changeset 6673decfa0fb078f60587f5cb5e98460eea137c2 by Steve Dower (Zackery Spytz) in branch 'master': bpo-24643: Fix "#define timezone _timezone" clashes on Windows (GH-12019) https://github.com/python/cpython/commit/6673decfa0fb078f60587f5cb5e98460eea137c2

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Change by Paul Ganssle : -- nosy: +p-ganssle ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe:

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Zackery Spytz added the comment: I've created a PR for this issue. -- nosy: +ZackerySpytz ___ Python tracker ___ ___

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Change by Zackery Spytz : -- keywords: +patch pull_requests: +12050 stage: needs patch -> patch review ___ Python tracker ___ ___

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Change by STINNER Victor : -- nosy: -vstinner ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe:

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: I'd still rather put the redefinitions in our files that need it, and leave end users untouched. -- ___ Python tracker ___

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Zachary Ware added the comment: This was just reported again in bpo-34657. We should go ahead and define _Py_timezone et al., which I will try to do today if nobody beats me to it :) -- priority: normal -> high versions: +Python 3.7, Python 3.8 -Python 3.5, Python 3.6

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

New submission from James Salter: For python 3.5, PC/pyconfig.h contains the following for vs2015 support: /* VS 2015 defines these names with a leading underscore */ #if _MSC_VER = 1900 #define timezone _timezone #define daylight _daylight #define tzname _tzname #endif This breaks any python

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Zachary Ware added the comment: I suppose we'll have to resort to #ifndef _Py_timezone #if _MSC_VER = 1900 #define _Py_timezone _timezone #else #define _Py_timezone timezone #endif #endif ... -- components: +Build, Windows -Extension Modules nosy: +paul.moore, steve.dower, tim.golden,

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: Or we could define _timezone on those platforms that don't have the underscore. I'm not hugely fussed either way. We need to fix this though. -- ___ Python tracker rep...@bugs.python.org

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

STINNER Victor added the comment: Can't we move the #define only in .c files where they are needed? Or in a private header (not included by Python.h)? -- nosy: +haypo ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue24643

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: That's probably an option, though it would break extensions that use `timezone` expecting it to work. But it seems like any change is going to cause that. I prefer defining _Py_timezone, since at least we can offer something that is portable for all Python 3.5

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: It's not, but #include python.h in any extension will make it available for you, so it's very likely that extensions have simply used it without adding their own conditional compilation for the various interpretations of whether timezone is standard or not. Bit

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

STINNER Victor added the comment: For me, it's not the responsability of python.h to ensure that the timezone symbol is available. -- ___ Python tracker rep...@bugs.python.org http://bugs.python.org/issue24643 ___

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Steve Dower added the comment: Agreed. However, I also don't want extensions to stop building because of a change we make. But since that's inevitable here, let's go with Zach's original suggestion and use a name that won't conflict. (IIRC, I originally put the #ifdefs in each file and was

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

STINNER Victor added the comment: That's probably an option, though it would break extensions that use `timezone` expecting it to work. Hum, I don't remember that the timezone symbol of part of the Python public API. Which extensions? -- ___

[issue24643] VS 2015 pyconfig.h #define timezone _timezone conflicts with timeb.h

Zachary Ware added the comment: (IIRC, I originally put the #ifdefs in each file and was told to move them to pyconfig.h...) Yeah, I think I did suggest that, to match what we do with hypot/_hypot for MSC 1600+. We should probably also change that one while fixing timezone, daylight, and