diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-02-25 16:15:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 16:15:04 -0800 |
| commit | 0b3019a02e60171e9b7edb261e1234109001819c (patch) | |
| tree | e7a13c2f7d77fd606b64cd83be301b95dde6cfd0 /PC | |
| parent | ea199b90bb61866cd3c2f154341d1eb0d5c4a710 (diff) | |
| download | cpython-git-0b3019a02e60171e9b7edb261e1234109001819c.tar.gz | |
bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (GH-12019)
(cherry picked from commit 6673decfa0fb078f60587f5cb5e98460eea137c2)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/pyconfig.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index bb9171fbcb..46fc84e92f 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 |