diff options
Diffstat (limited to 'PC/pyconfig.h')
| -rw-r--r-- | PC/pyconfig.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index ba80800..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. */ @@ -319,11 +324,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ their Makefile (other compilers are generally taken care of by distutils.) */ # if defined(_DEBUG) -# pragma comment(lib,"python32_d.lib") +# pragma comment(lib,"python33_d.lib") # elif defined(Py_LIMITED_API) # pragma comment(lib,"python3.lib") # else -# pragma comment(lib,"python32.lib") +# pragma comment(lib,"python33.lib") # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -550,10 +555,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you want to use the GNU readline library */ /* #define WITH_READLINE 1 */ -/* Define as the size of the unicode type. */ -/* This is enough for unicodeobject.h to do the "right thing" on Windows. */ -#define Py_UNICODE_SIZE 2 - /* Use Python's own small-block memory-allocator. */ #define WITH_PYMALLOC 1 @@ -714,9 +715,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you have the <sys/utsname.h> header file. */ /* #define HAVE_SYS_UTSNAME_H 1 */ -/* Define if you have the <thread.h> header file. */ -/* #undef HAVE_THREAD_H */ - /* Define if you have the <unistd.h> header file. */ /* #define HAVE_UNISTD_H 1 */ |