diff options
| author | Brian Curtin <brian@python.org> | 2012-05-13 16:19:23 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-05-13 16:19:23 (GMT) |
| commit | 401f9f3d32dcebf5ead8079d46a83fe7c7631581 (patch) | |
| tree | 899600f4dad86565fd3585499e2332d2a3599d42 /PC/pyconfig.h | |
| parent | 708d88c33441b29760b9246d61844eb59c1d0f3a (diff) | |
| download | cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.zip cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.gz cpython-401f9f3d32dcebf5ead8079d46a83fe7c7631581.tar.bz2 | |
Fix #13210. Port the Windows build from VS2008 to VS2010.
Diffstat (limited to 'PC/pyconfig.h')
| -rw-r--r-- | PC/pyconfig.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 3b71b47..d6de5f0 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -215,14 +215,19 @@ typedef int pid_t; #define copysign _copysign #define hypot _hypot -#endif /* _MSC_VER */ +/* 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 +#endif /* define some ANSI types that are not defined in earlier Win headers */ -#if defined(_MSC_VER) && _MSC_VER >= 1200 +#if _MSC_VER >= 1200 /* This file only exists in VC 6.0 or higher */ #include <basetsd.h> #endif +#endif /* _MSC_VER */ + /* ------------------------------------------------------------------------*/ /* The Borland compiler defines __BORLANDC__ */ /* XXX These defines are likely incomplete, but should be easy to fix. */ |