diff options
Diffstat (limited to 'Include/Python.h')
| -rw-r--r-- | Include/Python.h | 51 |
1 files changed, 20 insertions, 31 deletions
diff --git a/Include/Python.h b/Include/Python.h index 775412b..d6e47c2 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -8,14 +8,6 @@ #include "pyconfig.h" #include "pymacconfig.h" -/* Cyclic gc is always enabled, starting with release 2.3a1. Supply the - * old symbol for the benefit of extension modules written before then - * that may be conditionalizing on it. The core doesn't use it anymore. - */ -#ifndef WITH_CYCLE_GC -#define WITH_CYCLE_GC 1 -#endif - #include <limits.h> #ifndef UCHAR_MAX @@ -57,13 +49,7 @@ #include "pyport.h" -/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ -#ifndef DL_IMPORT /* declarations for DLL import/export */ -#define DL_IMPORT(RTYPE) RTYPE -#endif -#ifndef DL_EXPORT /* declarations for DLL import/export */ -#define DL_EXPORT(RTYPE) RTYPE -#endif +#include "pyatomic.h" /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. * PYMALLOC_DEBUG is in error if pymalloc is not in use. @@ -75,27 +61,25 @@ #error "PYMALLOC_DEBUG requires WITH_PYMALLOC" #endif #include "pymath.h" +#include "pytime.h" #include "pymem.h" #include "object.h" #include "objimpl.h" +#include "typeslots.h" #include "pydebug.h" +#include "bytearrayobject.h" +#include "bytesobject.h" #include "unicodeobject.h" -#include "intobject.h" -#include "boolobject.h" #include "longobject.h" +#include "longintrepr.h" +#include "boolobject.h" #include "floatobject.h" -#ifndef WITHOUT_COMPLEX #include "complexobject.h" -#endif #include "rangeobject.h" -#include "stringobject.h" #include "memoryobject.h" -#include "bufferobject.h" -#include "bytesobject.h" -#include "bytearrayobject.h" #include "tupleobject.h" #include "listobject.h" #include "dictobject.h" @@ -106,7 +90,6 @@ #include "funcobject.h" #include "classobject.h" #include "fileobject.h" -#include "cobject.h" #include "pycapsule.h" #include "traceback.h" #include "sliceobject.h" @@ -116,6 +99,7 @@ #include "descrobject.h" #include "warnings.h" #include "weakrefobject.h" +#include "structseq.h" #include "codecs.h" #include "pyerrors.h" @@ -131,6 +115,7 @@ #include "import.h" #include "abstract.h" +#include "bltinmodule.h" #include "compile.h" #include "eval.h" @@ -139,19 +124,23 @@ #include "pystrtod.h" #include "pystrcmp.h" #include "dtoa.h" +#include "fileutils.h" + +#ifdef __cplusplus +extern "C" { +#endif /* _Py_Mangle is defined in compile.c */ +#ifndef Py_LIMITED_API PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); +#endif -/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */ -#define PyArg_GetInt(v, a) PyArg_Parse((v), "i", (a)) - -/* PyArg_NoArgs should not be necessary. - Set ml_flags in the PyMethodDef to METH_NOARGS. */ -#define PyArg_NoArgs(v) PyArg_Parse(v, "") +#ifdef __cplusplus +} +#endif /* Argument must be a char or an int in [-128, 127] or [0, 255]. */ -#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) +#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) #include "pyfpe.h" |