diff options
Diffstat (limited to 'Include/Python.h')
| -rw-r--r-- | Include/Python.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Include/Python.h b/Include/Python.h index f0be28fa74..b09b4bbb70 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -6,6 +6,7 @@ #include "patchlevel.h" #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 @@ -43,7 +44,7 @@ #include <unistd.h> #endif -/* For uintptr_t, intptr_t */ +/* For size_t? */ #ifdef HAVE_STDDEF_H #include <stddef.h> #endif @@ -73,6 +74,7 @@ #if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC) #error "PYMALLOC_DEBUG requires WITH_PYMALLOC" #endif +#include "pymath.h" #include "pymem.h" #include "object.h" @@ -90,7 +92,10 @@ #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" @@ -108,6 +113,7 @@ #include "iterobject.h" #include "genobject.h" #include "descrobject.h" +#include "warnings.h" #include "weakrefobject.h" #include "codecs.h" @@ -129,6 +135,7 @@ #include "eval.h" #include "pystrtod.h" +#include "pystrcmp.h" /* _Py_Mangle is defined in compile.c */ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); @@ -140,13 +147,8 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); Set ml_flags in the PyMethodDef to METH_NOARGS. */ #define PyArg_NoArgs(v) PyArg_Parse(v, "") -/* Convert a possibly signed character to a nonnegative int */ -/* XXX This assumes characters are 8 bits wide */ -#ifdef __CHAR_UNSIGNED__ -#define Py_CHARMASK(c) (c) -#else -#define Py_CHARMASK(c) ((c) & 0xff) -#endif +/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ +#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) #include "pyfpe.h" |