diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-29 01:12:24 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-29 01:12:24 +0200 |
| commit | dfb866d127c852dfd2d36dfb766d90a518aaf516 (patch) | |
| tree | 572946c48d4f217f51f5233746cfaa43889d8566 /Include/Python.h | |
| parent | 2bdc7f591b729c7c0351f92a80d090e41a7cea49 (diff) | |
| download | cpython-git-dfb866d127c852dfd2d36dfb766d90a518aaf516.tar.gz | |
Enhance Py_ARRAY_LENGTH(): fail at build time if the argument is not an array
Move other various macros to pymcacro.h
Thanks Rusty Russell for having written these amazing C macros!
Diffstat (limited to 'Include/Python.h')
| -rw-r--r-- | Include/Python.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Include/Python.h b/Include/Python.h index 63043f2b9d..ae384ee015 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -48,6 +48,7 @@ #include <assert.h> #include "pyport.h" +#include "pymacro.h" #include "pyatomic.h" @@ -126,24 +127,6 @@ #include "pystrcmp.h" #include "dtoa.h" #include "fileutils.h" - -/* 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" -/* Define macros for inline documentation. */ -#define PyDoc_VAR(name) static char name[] -#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) -#ifdef WITH_DOC_STRINGS -#define PyDoc_STR(str) str -#else -#define PyDoc_STR(str) "" -#endif - -#define Py_ARRAY_LENGTH(array) (sizeof(array) / sizeof((array)[0])) - -#define Py_MIN(x, y) (((x) > (y)) ? (y) : (x)) -#define Py_MAX(x, y) (((x) > (y)) ? (x) : (y)) - #endif /* !Py_PYTHON_H */ |