diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-05-14 17:24:35 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-05-14 17:24:35 +0200 |
| commit | 45e8e2f2185fc593ae84a628922c5cbb1799b6ea (patch) | |
| tree | 5a6706f3fd37947b574fe44c45f6c4cb6f6f7c53 /Modules/_struct.c | |
| parent | 79b49ab553f74560d71dd027db252f4f0ddd0304 (diff) | |
| download | cpython-git-45e8e2f2185fc593ae84a628922c5cbb1799b6ea.tar.gz | |
Issue #21490: Add new C macros: Py_ABS() and Py_STRINGIFY()
Keep _Py_STRINGIZE() in PC/pyconfig.h to not introduce a dependency between
pyconfig.h and pymacros.h.
Diffstat (limited to 'Modules/_struct.c')
| -rw-r--r-- | Modules/_struct.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index 1de94e406e..4941fc8c82 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -85,8 +85,6 @@ typedef struct { char c; _Bool x; } s_bool; #define BOOL_ALIGN 0 #endif -#define STRINGIFY(x) #x - #ifdef __powerc #pragma options align=reset #endif @@ -546,8 +544,8 @@ np_short(char *p, PyObject *v, const formatdef *f) return -1; if (x < SHRT_MIN || x > SHRT_MAX){ PyErr_SetString(StructError, - "short format requires " STRINGIFY(SHRT_MIN) - " <= number <= " STRINGIFY(SHRT_MAX)); + "short format requires " Py_STRINGIFY(SHRT_MIN) + " <= number <= " Py_STRINGIFY(SHRT_MAX)); return -1; } y = (short)x; @@ -564,7 +562,8 @@ np_ushort(char *p, PyObject *v, const formatdef *f) return -1; if (x < 0 || x > USHRT_MAX){ PyErr_SetString(StructError, - "ushort format requires 0 <= number <= " STRINGIFY(USHRT_MAX)); + "ushort format requires 0 <= number <= " + Py_STRINGIFY(USHRT_MAX)); return -1; } y = (unsigned short)x; |