summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-02-25 23:56:44 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2019-02-25 23:56:44 (GMT)
commit6673decfa0fb078f60587f5cb5e98460eea137c2 (patch)
tree2d7a47850338e109f4fff4892468d6739a3c3a1a /PC
parentaadef2b41600cb6a4f845cdc4cea001c916d8745 (diff)
downloadcpython-6673decfa0fb078f60587f5cb5e98460eea137c2.zip
cpython-6673decfa0fb078f60587f5cb5e98460eea137c2.tar.gz
cpython-6673decfa0fb078f60587f5cb5e98460eea137c2.tar.bz2
bpo-24643: Fix "#define timezone _timezone" clashes on Windows (GH-12019)
Diffstat (limited to 'PC')
-rw-r--r--PC/pyconfig.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 42bbc69..6f8fda6 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -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