diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-06 21:11:25 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-06 21:11:25 -0400 |
| commit | 9c06648ea3157945a37a3b38e35d71c948b998dd (patch) | |
| tree | 6bc2c56520ecad5d30a8b5bbfcc2c05191cfc43f /Python/marshal.c | |
| parent | 1c41575d9be1e2bcce4916ed170fceacf456dd65 (diff) | |
| parent | 9d2ec0c84470eb9fdec4fe87cb223a425370e6c3 (diff) | |
| download | cpython-9c06648ea3157945a37a3b38e35d71c948b998dd.tar.gz | |
merge 3.4
Diffstat (limited to 'Python/marshal.c')
| -rw-r--r-- | Python/marshal.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Python/marshal.c b/Python/marshal.c index dc5411c1ff..ca64be3948 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -13,8 +13,6 @@ #include "code.h" #include "marshal.h" -#define ABS(x) ((x) < 0 ? -(x) : (x)) - /* High water mark to determine when the marshalled object is dangerously deep * and risks coring the interpreter. When the object stack gets this deep, * raise an exception instead of continuing. @@ -192,7 +190,7 @@ w_PyLong(const PyLongObject *ob, char flag, WFILE *p) } /* set l to number of base PyLong_MARSHAL_BASE digits */ - n = ABS(Py_SIZE(ob)); + n = Py_ABS(Py_SIZE(ob)); l = (n-1) * PyLong_MARSHAL_RATIO; d = ob->ob_digit[n-1]; assert(d != 0); /* a PyLong is always normalized */ @@ -727,8 +725,8 @@ r_PyLong(RFILE *p) return NULL; } - size = 1 + (ABS(n) - 1) / PyLong_MARSHAL_RATIO; - shorts_in_top_digit = 1 + (ABS(n) - 1) % PyLong_MARSHAL_RATIO; + size = 1 + (Py_ABS(n) - 1) / PyLong_MARSHAL_RATIO; + shorts_in_top_digit = 1 + (Py_ABS(n) - 1) % PyLong_MARSHAL_RATIO; ob = _PyLong_New(size); if (ob == NULL) return NULL; |