diff options
| author |   Steve Dower <steve.dower@microsoft.com> | 2014-11-22 12:54:57 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2014-11-22 12:54:57 -0800 |
| commit | 65e4cb10d9d9964f30bc72561bf0e86833328a3b (patch) | |
| tree | 1c9502ea790480e2ea06b380d912eeb879b2f96d /PC/pyconfig.h | |
| parent | Stop using a deprecated unittest.TestCase method. (diff) | |
| download | cpython-65e4cb10d9d9964f30bc72561bf0e86833328a3b.tar.gz cpython-65e4cb10d9d9964f30bc72561bf0e86833328a3b.tar.bz2 cpython-65e4cb10d9d9964f30bc72561bf0e86833328a3b.zip | |
Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.
Diffstat (limited to 'PC/pyconfig.h')
| -rw-r--r-- | PC/pyconfig.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 9cdc4c5a952..bd8844f5b42 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -213,6 +213,13 @@ typedef int pid_t; #define hypot _hypot #endif +/* 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 |