mirror of
https://github.com/python/cpython.git
synced 2025-11-20 10:57:44 +00:00
cd16bf6404
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
695 lines
19 KiB
C
695 lines
19 KiB
C
#ifndef Py_CONFIG_H
|
|
#define Py_CONFIG_H
|
|
|
|
/* pyconfig.h. NOT Generated automatically by configure.
|
|
|
|
This is a manually maintained version used for the Watcom,
|
|
Borland and Microsoft Visual C++ compilers. It is a
|
|
standard part of the Python distribution.
|
|
|
|
WINDOWS DEFINES:
|
|
The code specific to Windows should be wrapped around one of
|
|
the following #defines
|
|
|
|
MS_WIN64 - Code specific to the MS Win64 API
|
|
MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs)
|
|
MS_WINDOWS - Code specific to Windows, but all versions.
|
|
MS_WINCE - Code specific to Windows CE
|
|
Py_ENABLE_SHARED - Code if the Python core is built as a DLL.
|
|
|
|
Also note that neither "_M_IX86" or "_MSC_VER" should be used for
|
|
any purpose other than "Windows Intel x86 specific" and "Microsoft
|
|
compiler specific". Therefore, these should be very rare.
|
|
|
|
|
|
NOTE: The following symbols are deprecated:
|
|
NT, WIN32, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT
|
|
MS_CORE_DLL.
|
|
|
|
*/
|
|
|
|
#ifdef _WIN32_WCE
|
|
#define MS_WINCE
|
|
#endif
|
|
|
|
/* Visual Studio 2005 introduces deprecation warnings for
|
|
"insecure" and POSIX functions. The insecure functions should
|
|
be replaced by *_s versions (according to Microsoft); the
|
|
POSIX functions by _* versions (which, according to Microsoft,
|
|
would be ISO C conforming). Neither renaming is feasible, so
|
|
we just silence the warnings. */
|
|
|
|
#ifndef _CRT_SECURE_NO_DEPRECATE
|
|
#define _CRT_SECURE_NO_DEPRECATE 1
|
|
#endif
|
|
#ifndef _CRT_NONSTDC_NO_DEPRECATE
|
|
#define _CRT_NONSTDC_NO_DEPRECATE 1
|
|
#endif
|
|
|
|
/* 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
|
|
#endif
|
|
|
|
#ifdef HAVE_IO_H
|
|
#include <io.h>
|
|
#endif
|
|
|
|
#define HAVE_HYPOT
|
|
#define HAVE_STRFTIME
|
|
#define DONT_HAVE_SIG_ALARM
|
|
#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
|
|
#ifndef PYTHONPATH
|
|
# define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
|
|
#endif
|
|
#define NT_THREADS
|
|
#define WITH_THREAD
|
|
#ifndef NETSCAPE_PI
|
|
#define USE_SOCKET
|
|
#endif
|
|
|
|
#ifdef MS_WINCE
|
|
/* Python uses GetVersion() to distinguish between
|
|
* Windows NT and 9x/ME where OS Unicode support is concerned.
|
|
* Windows CE supports Unicode in the same way as NT so we
|
|
* define the missing GetVersion() accordingly.
|
|
*/
|
|
#define GetVersion() (4)
|
|
/* Windows CE does not support environment variables */
|
|
#define getenv(v) (NULL)
|
|
#define environ (NULL)
|
|
#endif
|
|
|
|
/* Compiler specific defines */
|
|
|
|
/* ------------------------------------------------------------------------*/
|
|
/* Microsoft C defines _MSC_VER */
|
|
#ifdef _MSC_VER
|
|
|
|
/* We want COMPILER to expand to a string containing _MSC_VER's *value*.
|
|
* This is horridly tricky, because the stringization operator only works
|
|
* on macro arguments, and doesn't evaluate macros passed *as* arguments.
|
|
* Attempts simpler than the following appear doomed to produce "_MSC_VER"
|
|
* literally in the string.
|
|
*/
|
|
#define _Py_PASTE_VERSION(SUFFIX) \
|
|
("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]")
|
|
/* e.g., this produces, after compile-time string catenation,
|
|
* ("[MSC v.1200 32 bit (Intel)]")
|
|
*
|
|
* _Py_STRINGIZE(_MSC_VER) expands to
|
|
* _Py_STRINGIZE1((_MSC_VER)) expands to
|
|
* _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting
|
|
* it's scanned again for macros and so further expands to (under MSVC 6)
|
|
* _Py_STRINGIZE2(1200) which then expands to
|
|
* "1200"
|
|
*/
|
|
#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
|
|
#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
|
|
#define _Py_STRINGIZE2(X) #X
|
|
|
|
/* MSVC defines _WINxx to differentiate the windows platform types
|
|
|
|
Note that for compatibility reasons _WIN32 is defined on Win32
|
|
*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)
|
|
Some modules are disabled on Itanium processors, therefore we
|
|
have MS_WINI64 set for those targets, otherwise MS_WINX64
|
|
*/
|
|
#ifdef _WIN64
|
|
#define MS_WIN64
|
|
#endif
|
|
|
|
/* set the COMPILER */
|
|
#ifdef MS_WIN64
|
|
#if defined(_M_IA64)
|
|
#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
|
|
#define MS_WINI64
|
|
#elif defined(_M_X64)
|
|
#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
|
|
#define MS_WINX64
|
|
#else
|
|
#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
|
|
#endif
|
|
#endif /* MS_WIN64 */
|
|
|
|
/* set the version macros for the windows headers */
|
|
#ifdef MS_WINX64
|
|
/* 64 bit only runs on XP or greater */
|
|
#define _WIN32_WINNT 0x0501
|
|
#define WINVER 0x0501
|
|
#else
|
|
/* NT 4.0 or greater required otherwise */
|
|
#define _WIN32_WINNT 0x0400
|
|
#define WINVER 0x0400
|
|
#endif
|
|
|
|
/* _W64 is not defined for VC6 or eVC4 */
|
|
#ifndef _W64
|
|
#define _W64
|
|
#endif
|
|
|
|
/* Define like size_t, omitting the "unsigned" */
|
|
#ifdef MS_WIN64
|
|
typedef __int64 ssize_t;
|
|
#else
|
|
typedef _W64 int ssize_t;
|
|
#endif
|
|
#define HAVE_SSIZE_T 1
|
|
|
|
#if defined(MS_WIN32) && !defined(MS_WIN64)
|
|
#ifdef _M_IX86
|
|
#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
|
|
#else
|
|
#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
|
|
#endif
|
|
#endif /* MS_WIN32 && !MS_WIN64 */
|
|
|
|
typedef int pid_t;
|
|
#define hypot _hypot
|
|
|
|
#include <float.h>
|
|
#define Py_IS_NAN _isnan
|
|
#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
|
|
#define Py_IS_FINITE(X) _finite(X)
|
|
|
|
/* Turn off warnings about deprecated C runtime functions in
|
|
VisualStudio .NET 2005 */
|
|
#if _MSC_VER >= 1400 && !defined _CRT_SECURE_NO_DEPRECATE
|
|
#define _CRT_SECURE_NO_DEPRECATE
|
|
#endif
|
|
|
|
#endif /* _MSC_VER */
|
|
|
|
/* define some ANSI types that are not defined in earlier Win headers */
|
|
#if defined(_MSC_VER) && _MSC_VER >= 1200
|
|
/* This file only exists in VC 6.0 or higher */
|
|
#include <basetsd.h>
|
|
#endif
|
|
|
|
/* ------------------------------------------------------------------------*/
|
|
/* The Borland compiler defines __BORLANDC__ */
|
|
/* XXX These defines are likely incomplete, but should be easy to fix. */
|
|
#ifdef __BORLANDC__
|
|
#define COMPILER "[Borland]"
|
|
|
|
#ifdef _WIN32
|
|
/* tested with BCC 5.5 (__BORLANDC__ >= 0x0550)
|
|
*/
|
|
|
|
typedef int pid_t;
|
|
/* BCC55 seems to understand __declspec(dllimport), it is used in its
|
|
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
|
|
|
|
/* rename a few functions for the Borland compiler */
|
|
#include <io.h>
|
|
#define _chsize chsize
|
|
#define _setmode setmode
|
|
|
|
#else /* !_WIN32 */
|
|
#error "Only Win32 and later are supported"
|
|
#endif /* !_WIN32 */
|
|
|
|
#endif /* BORLANDC */
|
|
|
|
/* ------------------------------------------------------------------------*/
|
|
/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */
|
|
#if defined(__GNUC__) && defined(_WIN32)
|
|
/* XXX These defines are likely incomplete, but should be easy to fix.
|
|
They should be complete enough to build extension modules. */
|
|
/* Suggested by Rene Liebscher <R.Liebscher@gmx.de> to avoid a GCC 2.91.*
|
|
bug that requires structure imports. More recent versions of the
|
|
compiler don't exhibit this bug.
|
|
*/
|
|
#if (__GNUC__==2) && (__GNUC_MINOR__<=91)
|
|
#warning "Please use an up-to-date version of gcc! (>2.91 recommended)"
|
|
#endif
|
|
|
|
#define COMPILER "[gcc]"
|
|
#define hypot _hypot
|
|
#define PY_LONG_LONG long long
|
|
#define PY_LLONG_MIN LLONG_MIN
|
|
#define PY_LLONG_MAX LLONG_MAX
|
|
#define PY_ULLONG_MAX ULLONG_MAX
|
|
#endif /* GNUC */
|
|
|
|
/* ------------------------------------------------------------------------*/
|
|
/* lcc-win32 defines __LCC__ */
|
|
#if defined(__LCC__)
|
|
/* XXX These defines are likely incomplete, but should be easy to fix.
|
|
They should be complete enough to build extension modules. */
|
|
|
|
#define COMPILER "[lcc-win32]"
|
|
typedef int pid_t;
|
|
/* __declspec() is supported here too - do nothing to get the defaults */
|
|
|
|
#endif /* LCC */
|
|
|
|
/* ------------------------------------------------------------------------*/
|
|
/* End of compilers - finish up */
|
|
|
|
#ifndef NO_STDIO_H
|
|
# include <stdio.h>
|
|
#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 LLONG_MAX
|
|
# define PY_LLONG_MIN LLONG_MIN
|
|
# define PY_ULLONG_MAX ULLONG_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 */
|
|
#endif /* !MS_NO_COREDLL && ... */
|
|
|
|
/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */
|
|
#ifdef USE_DL_EXPORT
|
|
# define Py_BUILD_CORE
|
|
#endif /* USE_DL_EXPORT */
|
|
|
|
/* All windows compilers that use this header support __declspec */
|
|
#define HAVE_DECLSPEC_DLL
|
|
|
|
/* 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.) */
|
|
# ifdef _DEBUG
|
|
# pragma comment(lib,"python26_d.lib")
|
|
# else
|
|
# pragma comment(lib,"python26.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
|
|
/* 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
|
|
#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
|
|
#endif
|
|
|
|
#ifdef _DEBUG
|
|
# define Py_DEBUG
|
|
#endif
|
|
|
|
|
|
#ifdef MS_WIN32
|
|
|
|
#define SIZEOF_SHORT 2
|
|
#define SIZEOF_INT 4
|
|
#define SIZEOF_LONG 4
|
|
#define SIZEOF_LONG_LONG 8
|
|
#define SIZEOF_DOUBLE 8
|
|
#define SIZEOF_FLOAT 4
|
|
|
|
/* VC 7.1 has them and VC 6.0 does not. VC 6.0 has a version number of 1200.
|
|
Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't
|
|
define these.
|
|
If some compiler does not provide them, modify the #if appropriately. */
|
|
#if defined(_MSC_VER)
|
|
#if _MSC_VER > 1201
|
|
#define HAVE_UINTPTR_T 1
|
|
#define HAVE_INTPTR_T 1
|
|
#else
|
|
/* VC6 & eVC4 don't support the C99 LL suffix for 64-bit integer literals */
|
|
#define Py_LL(x) x##I64
|
|
#endif /* _MSC_VER > 1200 */
|
|
#endif /* _MSC_VER */
|
|
|
|
#endif
|
|
|
|
/* Fairly standard from here! */
|
|
|
|
/* Define if on AIX 3.
|
|
System headers sometimes define this.
|
|
We just want to avoid a redefinition error message. */
|
|
#ifndef _ALL_SOURCE
|
|
/* #undef _ALL_SOURCE */
|
|
#endif
|
|
|
|
/* Define to empty if the keyword does not work. */
|
|
/* #define const */
|
|
|
|
/* Define to 1 if you have the <conio.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_CONIO_H 1
|
|
#endif
|
|
|
|
/* Define to 1 if you have the <direct.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_DIRECT_H 1
|
|
#endif
|
|
|
|
/* Define if you have dirent.h. */
|
|
/* #define DIRENT 1 */
|
|
|
|
/* Define to the type of elements in the array set by `getgroups'.
|
|
Usually this is either `int' or `gid_t'. */
|
|
/* #undef GETGROUPS_T */
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
/* #undef gid_t */
|
|
|
|
/* Define if your struct tm has tm_zone. */
|
|
/* #undef HAVE_TM_ZONE */
|
|
|
|
/* Define if you don't have tm_zone but do have the external array
|
|
tzname. */
|
|
#define HAVE_TZNAME
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
/* #undef mode_t */
|
|
|
|
/* Define if you don't have dirent.h, but have ndir.h. */
|
|
/* #undef NDIR */
|
|
|
|
/* Define to `long' if <sys/types.h> doesn't define. */
|
|
/* #undef off_t */
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
/* #undef pid_t */
|
|
|
|
/* Define if the system does not provide POSIX.1 features except
|
|
with this defined. */
|
|
/* #undef _POSIX_1_SOURCE */
|
|
|
|
/* Define if you need to in order for stat and other things to work. */
|
|
/* #undef _POSIX_SOURCE */
|
|
|
|
/* Define as the return type of signal handlers (int or void). */
|
|
#define RETSIGTYPE void
|
|
|
|
/* Define to `unsigned' if <sys/types.h> doesn't define. */
|
|
/* #undef size_t */
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
#if _MSC_VER + 0 >= 1300
|
|
/* VC.NET typedefs socklen_t in ws2tcpip.h. */
|
|
#else
|
|
#define socklen_t int
|
|
#endif
|
|
|
|
/* Define if you have the ANSI C header files. */
|
|
#define STDC_HEADERS 1
|
|
|
|
/* Define if you don't have dirent.h, but have sys/dir.h. */
|
|
/* #undef SYSDIR */
|
|
|
|
/* Define if you don't have dirent.h, but have sys/ndir.h. */
|
|
/* #undef SYSNDIR */
|
|
|
|
/* Define if you can safely include both <sys/time.h> and <time.h>. */
|
|
/* #undef TIME_WITH_SYS_TIME */
|
|
|
|
/* Define if your <sys/time.h> declares struct tm. */
|
|
/* #define TM_IN_SYS_TIME 1 */
|
|
|
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
|
/* #undef uid_t */
|
|
|
|
/* Define if the closedir function returns void instead of int. */
|
|
/* #undef VOID_CLOSEDIR */
|
|
|
|
/* Define if getpgrp() must be called as getpgrp(0)
|
|
and (consequently) setpgrp() as setpgrp(0, 0). */
|
|
/* #undef GETPGRP_HAVE_ARGS */
|
|
|
|
/* Define this if your time.h defines altzone */
|
|
/* #define HAVE_ALTZONE */
|
|
|
|
/* Define if you have the putenv function. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_PUTENV
|
|
#endif
|
|
|
|
/* Define if your compiler supports function prototypes */
|
|
#define HAVE_PROTOTYPES
|
|
|
|
/* Define if you can safely include both <sys/select.h> and <sys/time.h>
|
|
(which you can't on SCO ODT 3.0). */
|
|
/* #undef SYS_SELECT_WITH_SYS_TIME */
|
|
|
|
/* Define if you want documentation strings in extension modules */
|
|
#define WITH_DOC_STRINGS 1
|
|
|
|
/* Define if you want to compile in rudimentary thread support */
|
|
/* #undef WITH_THREAD */
|
|
|
|
/* 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
|
|
|
|
/* Define to indicate that the Python Unicode representation can be passed
|
|
as-is to Win32 Wide API. */
|
|
#define Py_WIN_WIDE_FILENAMES
|
|
|
|
/* Use Python's own small-block memory-allocator. */
|
|
#define WITH_PYMALLOC 1
|
|
|
|
/* Define if you have clock. */
|
|
/* #define HAVE_CLOCK */
|
|
|
|
/* Define when any dynamic module loading is enabled */
|
|
#define HAVE_DYNAMIC_LOADING
|
|
|
|
/* Define if you have ftime. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_FTIME
|
|
#endif
|
|
|
|
/* Define if you have getpeername. */
|
|
#define HAVE_GETPEERNAME
|
|
|
|
/* Define if you have getpgrp. */
|
|
/* #undef HAVE_GETPGRP */
|
|
|
|
/* Define if you have getpid. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_GETPID
|
|
#endif
|
|
|
|
/* Define if you have gettimeofday. */
|
|
/* #undef HAVE_GETTIMEOFDAY */
|
|
|
|
/* Define if you have getwd. */
|
|
/* #undef HAVE_GETWD */
|
|
|
|
/* Define if you have lstat. */
|
|
/* #undef HAVE_LSTAT */
|
|
|
|
/* Define if you have the mktime function. */
|
|
#define HAVE_MKTIME
|
|
|
|
/* Define if you have nice. */
|
|
/* #undef HAVE_NICE */
|
|
|
|
/* Define if you have readlink. */
|
|
/* #undef HAVE_READLINK */
|
|
|
|
/* Define if you have select. */
|
|
/* #undef HAVE_SELECT */
|
|
|
|
/* Define if you have setpgid. */
|
|
/* #undef HAVE_SETPGID */
|
|
|
|
/* Define if you have setpgrp. */
|
|
/* #undef HAVE_SETPGRP */
|
|
|
|
/* Define if you have setsid. */
|
|
/* #undef HAVE_SETSID */
|
|
|
|
/* Define if you have setvbuf. */
|
|
#define HAVE_SETVBUF
|
|
|
|
/* Define if you have siginterrupt. */
|
|
/* #undef HAVE_SIGINTERRUPT */
|
|
|
|
/* Define if you have symlink. */
|
|
/* #undef HAVE_SYMLINK */
|
|
|
|
/* Define if you have tcgetpgrp. */
|
|
/* #undef HAVE_TCGETPGRP */
|
|
|
|
/* Define if you have tcsetpgrp. */
|
|
/* #undef HAVE_TCSETPGRP */
|
|
|
|
/* Define if you have times. */
|
|
/* #undef HAVE_TIMES */
|
|
|
|
/* Define if you have uname. */
|
|
/* #undef HAVE_UNAME */
|
|
|
|
/* Define if you have waitpid. */
|
|
/* #undef HAVE_WAITPID */
|
|
|
|
/* Define to 1 if you have the `wcscoll' function. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_WCSCOLL 1
|
|
#endif
|
|
|
|
/* Define if you have the <dlfcn.h> header file. */
|
|
/* #undef HAVE_DLFCN_H */
|
|
|
|
/* Define to 1 if you have the <errno.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_ERRNO_H 1
|
|
#endif
|
|
|
|
/* Define if you have the <fcntl.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_FCNTL_H 1
|
|
#endif
|
|
|
|
/* Define to 1 if you have the <process.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_PROCESS_H 1
|
|
#endif
|
|
|
|
/* Define to 1 if you have the <signal.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_SIGNAL_H 1
|
|
#endif
|
|
|
|
/* Define if you have the <stdarg.h> prototypes. */
|
|
#define HAVE_STDARG_PROTOTYPES
|
|
|
|
/* Define if you have the <stddef.h> header file. */
|
|
#define HAVE_STDDEF_H 1
|
|
|
|
/* Define if you have the <sys/audioio.h> header file. */
|
|
/* #undef HAVE_SYS_AUDIOIO_H */
|
|
|
|
/* Define if you have the <sys/param.h> header file. */
|
|
/* #define HAVE_SYS_PARAM_H 1 */
|
|
|
|
/* Define if you have the <sys/select.h> header file. */
|
|
/* #define HAVE_SYS_SELECT_H 1 */
|
|
|
|
/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_SYS_STAT_H 1
|
|
#endif
|
|
|
|
/* Define if you have the <sys/time.h> header file. */
|
|
/* #define HAVE_SYS_TIME_H 1 */
|
|
|
|
/* Define if you have the <sys/times.h> header file. */
|
|
/* #define HAVE_SYS_TIMES_H 1 */
|
|
|
|
/* Define to 1 if you have the <sys/types.h> header file. */
|
|
#ifndef MS_WINCE
|
|
#define HAVE_SYS_TYPES_H 1
|
|
#endif
|
|
|
|
/* Define if you have the <sys/un.h> header file. */
|
|
/* #define HAVE_SYS_UN_H 1 */
|
|
|
|
/* Define if you have the <sys/utime.h> header file. */
|
|
/* #define HAVE_SYS_UTIME_H 1 */
|
|
|
|
/* 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 */
|
|
|
|
/* Define if you have the <utime.h> header file. */
|
|
/* #define HAVE_UTIME_H 1 */
|
|
|
|
/* Define if the compiler provides a wchar.h header file. */
|
|
#define HAVE_WCHAR_H 1
|
|
|
|
/* Define if you have the dl library (-ldl). */
|
|
/* #undef HAVE_LIBDL */
|
|
|
|
/* Define if you have the mpc library (-lmpc). */
|
|
/* #undef HAVE_LIBMPC */
|
|
|
|
/* Define if you have the nsl library (-lnsl). */
|
|
#define HAVE_LIBNSL 1
|
|
|
|
/* Define if you have the seq library (-lseq). */
|
|
/* #undef HAVE_LIBSEQ */
|
|
|
|
/* Define if you have the socket library (-lsocket). */
|
|
#define HAVE_LIBSOCKET 1
|
|
|
|
/* Define if you have the sun library (-lsun). */
|
|
/* #undef HAVE_LIBSUN */
|
|
|
|
/* Define if you have the termcap library (-ltermcap). */
|
|
/* #undef HAVE_LIBTERMCAP */
|
|
|
|
/* Define if you have the termlib library (-ltermlib). */
|
|
/* #undef HAVE_LIBTERMLIB */
|
|
|
|
/* Define if you have the thread library (-lthread). */
|
|
/* #undef HAVE_LIBTHREAD */
|
|
|
|
/* WinSock does not use a bitmask in select, and uses
|
|
socket handles greater than FD_SETSIZE */
|
|
#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
|
|
|
|
#endif /* !Py_CONFIG_H */
|