mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bpo-24643: Fix "#define timezone _timezone" clashes on Windows (GH-12019)

Browse source
This commit is contained in:
Zackery Spytz 2019-02-25 16:56:44 -07:00 • committed by Steve Dower
parent aadef2b416
commit 6673decfa0
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PC/pyconfig.h
View file

@ -192,13 +192,6 @@ typedef int pid_t;
#define Py_IS_FINITE(X) _finite(X)
#define copysign _copysign
/* VS 2015 defines these names with a leading underscore */
#if _MSC_VER >= 1900
#define timezone _timezone
#define daylight _daylight
#define tzname _tzname
#endif
/* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/
#if _MSC_VER >= 1400 && _MSC_VER < 1600
#define HAVE_SXS 1