diff -r 5f7b03dcd523 PC/pyconfig.h --- a/PC/pyconfig.h Wed Jul 20 11:41:21 2011 -0400 +++ b/PC/pyconfig.h Wed Jul 20 17:07:20 2011 +0100 @@ -36,7 +36,7 @@ /* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ #ifdef USE_DL_EXPORT -# define Py_BUILD_CORE +# define Py_BUILD_CORE #endif /* USE_DL_EXPORT */ /* Visual Studio 2005 introduces deprecation warnings for @@ -55,24 +55,24 @@ /* Windows CE does not have these */ #ifndef MS_WINCE -#define HAVE_IO_H -#define HAVE_SYS_UTIME_H -#define HAVE_TEMPNAM -#define HAVE_TMPFILE -#define HAVE_TMPNAM -#define HAVE_CLOCK -#define HAVE_STRERROR +#define HAVE_IO_H 1 +#define HAVE_SYS_UTIME_H 1 +#define HAVE_TEMPNAM 1 +#define HAVE_TMPFILE 1 +#define HAVE_TMPNAM 1 +#define HAVE_CLOCK 1 +#define HAVE_STRERROR 1 #endif #ifdef HAVE_IO_H #include #endif -#define HAVE_HYPOT -#define HAVE_STRFTIME +#define HAVE_HYPOT 1 +#define HAVE_STRFTIME 1 #define DONT_HAVE_SIG_ALARM #define DONT_HAVE_SIG_PAUSE -#define LONG_BIT 32 +#define LONG_BIT 32 #define WORD_BIT 32 #define PREFIX "" #define EXEC_PREFIX "" @@ -80,7 +80,7 @@ #define MS_WIN32 /* only support win32 and greater. */ #define MS_WINDOWS #ifndef PYTHONPATH -# define PYTHONPATH L".\\DLLs;.\\lib" +# define PYTHONPATH L".\\DLLs;.\\lib" #endif #define NT_THREADS #define WITH_THREAD @@ -113,9 +113,9 @@ * literally in the string. */ #define _Py_PASTE_VERSION(SUFFIX) \ - ("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]") + ("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]") /* e.g., this produces, after compile-time string catenation, - * ("[MSC v.1200 32 bit (Intel)]") + * ("[MSC v.1200 32 bit (Intel)]") * * _Py_STRINGIZE(_MSC_VER) expands to * _Py_STRINGIZE1((_MSC_VER)) expands to @@ -134,7 +134,7 @@ *and* on Win64. For the same reasons, in Python, MS_WIN32 is defined on Win32 *and* Win64. Win32 only code must therefore be guarded as follows: - #if defined(MS_WIN32) && !defined(MS_WIN64) + #if defined(MS_WIN32) && !defined(MS_WIN64) Some modules are disabled on Itanium processors, therefore we have MS_WINI64 set for those targets, otherwise MS_WINX64 */ @@ -238,8 +238,8 @@ own header files (winnt.h, ...) - so we can do nothing and get the default*/ #undef HAVE_SYS_UTIME_H -#define HAVE_UTIME_H -#define HAVE_DIRENT_H +#define HAVE_UTIME_H 1 +#define HAVE_DIRENT_H 1 /* rename a few functions for the Borland compiler */ #include @@ -289,23 +289,23 @@ /* End of compilers - finish up */ #ifndef NO_STDIO_H -# include +# include #endif /* 64 bit ints are usually spelt __int64 unless compiler has overridden */ #define HAVE_LONG_LONG 1 #ifndef PY_LONG_LONG -# define PY_LONG_LONG __int64 -# define PY_LLONG_MAX _I64_MAX -# define PY_LLONG_MIN _I64_MIN -# define PY_ULLONG_MAX _UI64_MAX +# define PY_LONG_LONG __int64 +# define PY_LLONG_MAX _I64_MAX +# define PY_LLONG_MIN _I64_MIN +# define PY_ULLONG_MAX _UI64_MAX #endif /* For Windows the Python core is in a DLL by default. Test Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) -# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ -# define MS_COREDLL /* deprecated old symbol */ +# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ +# define MS_COREDLL /* deprecated old symbol */ #endif /* !MS_NO_COREDLL && ... */ /* All windows compilers that use this header support __declspec */ @@ -313,57 +313,57 @@ /* For an MSVC DLL, we can nominate the .lib files used by extensions */ #ifdef MS_COREDLL -# ifndef Py_BUILD_CORE /* not building the core - must be an ext */ -# if defined(_MSC_VER) - /* So MSVC users need not specify the .lib file in - their Makefile (other compilers are generally - taken care of by distutils.) */ -# if defined(_DEBUG) -# pragma comment(lib,"python33_d.lib") -# elif defined(Py_LIMITED_API) -# pragma comment(lib,"python3.lib") -# else -# pragma comment(lib,"python33.lib") -# endif /* _DEBUG */ -# endif /* _MSC_VER */ -# endif /* Py_BUILD_CORE */ +# ifndef Py_BUILD_CORE /* not building the core - must be an ext */ +# if defined(_MSC_VER) + /* So MSVC users need not specify the .lib file in + their Makefile (other compilers are generally + taken care of by distutils.) */ +# if defined(_DEBUG) +# pragma comment(lib,"python33_d.lib") +# elif defined(Py_LIMITED_API) +# pragma comment(lib,"python3.lib") +# else +# pragma comment(lib,"python33.lib") +# endif /* _DEBUG */ +# endif /* _MSC_VER */ +# endif /* Py_BUILD_CORE */ #endif /* MS_COREDLL */ #if defined(MS_WIN64) /* maintain "win32" sys.platform for backward compatibility of Python code, the Win64 API should be close enough to the Win32 API to make this preferable */ -# define PLATFORM "win32" -# define SIZEOF_VOID_P 8 -# define SIZEOF_TIME_T 8 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 8 -# define SIZEOF_SIZE_T 8 +# define PLATFORM "win32" +# define SIZEOF_VOID_P 8 +# define SIZEOF_TIME_T 8 +# define SIZEOF_OFF_T 4 +# define SIZEOF_FPOS_T 8 +# define SIZEOF_HKEY 8 +# define SIZEOF_SIZE_T 8 /* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t). On Win64 the second condition is not true, but if fpos_t replaces off_t then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 should define this. */ -# define HAVE_LARGEFILE_SUPPORT +# define HAVE_LARGEFILE_SUPPORT 1 #elif defined(MS_WIN32) -# define PLATFORM "win32" -# define HAVE_LARGEFILE_SUPPORT -# define SIZEOF_VOID_P 4 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 4 -# define SIZEOF_SIZE_T 4 - /* MS VS2005 changes time_t to an 64-bit type on all platforms */ -# if defined(_MSC_VER) && _MSC_VER >= 1400 -# define SIZEOF_TIME_T 8 -# else -# define SIZEOF_TIME_T 4 -# endif +# define PLATFORM "win32" +# define HAVE_LARGEFILE_SUPPORT 1 +# define SIZEOF_VOID_P 4 +# define SIZEOF_OFF_T 4 +# define SIZEOF_FPOS_T 8 +# define SIZEOF_HKEY 4 +# define SIZEOF_SIZE_T 4 + /* MS VS2005 changes time_t to an 64-bit type on all platforms */ +# if defined(_MSC_VER) && _MSC_VER >= 1400 +# define SIZEOF_TIME_T 8 +# else +# define SIZEOF_TIME_T 4 +# endif #endif #ifdef _DEBUG -# define Py_DEBUG +# define Py_DEBUG #endif @@ -527,15 +527,15 @@ /* #undef GETPGRP_HAVE_ARGS */ /* Define this if your time.h defines altzone */ -/* #define HAVE_ALTZONE */ +/* #define HAVE_ALTZONE 1 */ /* Define if you have the putenv function. */ #ifndef MS_WINCE -#define HAVE_PUTENV +#define HAVE_PUTENV 1 #endif /* Define if your compiler supports function prototypes */ -#define HAVE_PROTOTYPES +#define HAVE_PROTOTYPES 1 /* Define if you can safely include both and (which you can't on SCO ODT 3.0). */ @@ -558,25 +558,25 @@ #define WITH_PYMALLOC 1 /* Define if you have clock. */ -/* #define HAVE_CLOCK */ +/* #define HAVE_CLOCK 1 */ /* Define when any dynamic module loading is enabled */ #define HAVE_DYNAMIC_LOADING /* Define if you have ftime. */ #ifndef MS_WINCE -#define HAVE_FTIME +#define HAVE_FTIME 1 #endif /* Define if you have getpeername. */ -#define HAVE_GETPEERNAME +#define HAVE_GETPEERNAME 1 /* Define if you have getpgrp. */ /* #undef HAVE_GETPGRP */ /* Define if you have getpid. */ #ifndef MS_WINCE -#define HAVE_GETPID +#define HAVE_GETPID 1 #endif /* Define if you have gettimeofday. */ @@ -589,7 +589,7 @@ /* #undef HAVE_LSTAT */ /* Define if you have the mktime function. */ -#define HAVE_MKTIME +#define HAVE_MKTIME 1 /* Define if you have nice. */ /* #undef HAVE_NICE */ @@ -610,7 +610,7 @@ /* #undef HAVE_SETSID */ /* Define if you have setvbuf. */ -#define HAVE_SETVBUF +#define HAVE_SETVBUF 1 /* Define if you have siginterrupt. */ /* #undef HAVE_SIGINTERRUPT */ @@ -672,7 +672,7 @@ #endif /* Define if you have the prototypes. */ -#define HAVE_STDARG_PROTOTYPES +#define HAVE_STDARG_PROTOTYPES 1 /* Define if you have the header file. */ #define HAVE_STDDEF_H 1