diff options
| author | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
| commit | c97ec8fa6978657bfb8069db4128f785b29ea0aa (patch) | |
| tree | 46aa19c3d8f30869ec71ad17a39bc4275b5c4cf6 /Objects/frameobject.c | |
| parent | af38f5a5032e49d527adcb9c594abfeba5d9b9b2 (diff) | |
| parent | 640c35ce135d71c6aafa13bb5985150f680416cc (diff) | |
| download | cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.zip cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.gz cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.bz2 | |
merge
Diffstat (limited to 'Objects/frameobject.c')
| -rw-r--r-- | Objects/frameobject.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 6fff370..d3b59f1 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -7,11 +7,6 @@ #include "opcode.h" #include "structmember.h" -#undef MIN -#undef MAX -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - #define OFF(x) offsetof(PyFrameObject, x) static PyMemberDef frame_memberlist[] = { @@ -160,8 +155,8 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) /* We're now ready to look at the bytecode. */ PyBytes_AsStringAndSize(f->f_code->co_code, (char **)&code, &code_len); - min_addr = MIN(new_lasti, f->f_lasti); - max_addr = MAX(new_lasti, f->f_lasti); + min_addr = Py_MIN(new_lasti, f->f_lasti); + max_addr = Py_MAX(new_lasti, f->f_lasti); /* You can't jump onto a line with an 'except' statement on it - * they expect to have an exception on the top of the stack, which @@ -293,7 +288,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) break; } - min_delta_iblock = MIN(min_delta_iblock, delta_iblock); + min_delta_iblock = Py_MIN(min_delta_iblock, delta_iblock); if (op >= HAVE_ARGUMENT) { addr += 2; |