diff options
Diffstat (limited to 'PC/pyconfig.h')
| -rw-r--r-- | PC/pyconfig.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index f320ccf588..299527db7d 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -74,8 +74,6 @@ WIN32 is still required for the locale module. #define DONT_HAVE_SIG_PAUSE #define LONG_BIT 32 #define WORD_BIT 32 -#define PREFIX "" -#define EXEC_PREFIX "" #define MS_WIN32 /* only support win32 and greater. */ #define MS_WINDOWS @@ -156,15 +154,9 @@ WIN32 is still required for the locale module. #endif /* MS_WIN64 */ /* set the version macros for the windows headers */ -#ifdef MS_WINX64 -/* 64 bit only runs on XP or greater */ +/* Python 3.4+ requires Windows XP or greater */ #define Py_WINVER 0x0501 /* _WIN32_WINNT_WINXP */ #define Py_NTDDI NTDDI_WINXP -#else -/* Python 2.6+ requires Windows 2000 or greater */ -#define Py_WINVER 0x0500 /* _WIN32_WINNT_WIN2K */ -#define Py_NTDDI NTDDI_WIN2KSP4 -#endif /* We only set these values when building Python - we don't want to force these values on extensions, as that will affect the prototypes and @@ -199,8 +191,10 @@ typedef _W64 int ssize_t; #define HAVE_SSIZE_T 1 #if defined(MS_WIN32) && !defined(MS_WIN64) -#ifdef _M_IX86 +#if defined(_M_IX86) #define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") +#elif defined(_M_ARM) +#define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") #else #define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)") #endif @@ -324,11 +318,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,"python33_d.lib") +# pragma comment(lib,"python34_d.lib") # elif defined(Py_LIMITED_API) # pragma comment(lib,"python3.lib") # else -# pragma comment(lib,"python33.lib") +# pragma comment(lib,"python34.lib") # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ @@ -727,6 +721,9 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* The size of `wchar_t', as computed by sizeof. */ #define SIZEOF_WCHAR_T 2 +/* The size of `pid_t', as computed by sizeof. */ +#define SIZEOF_PID_T SIZEOF_INT + /* Define if you have the dl library (-ldl). */ /* #undef HAVE_LIBDL */ |