Less ugly #ifdefs for C profiling fix
diff --git a/Python/ceval.c b/Python/ceval.c
index 6bc35d0..6f6fef6 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3438,6 +3438,7 @@
nargs);
}
+#ifdef WITH_C_PROF
#define BEGIN_C_TRACE \
if (tstate->use_tracing) { \
if (tstate->c_profilefunc != NULL) { \
@@ -3472,6 +3473,10 @@
} \
} \
}
+#else
+#define BEGIN_C_TRACE
+#define END_C_TRACE
+#endif
static PyObject *
@@ -3503,23 +3508,15 @@
PyCFunction meth = PyCFunction_GET_FUNCTION(func);
PyObject *self = PyCFunction_GET_SELF(func);
if (flags & METH_NOARGS && na == 0) {
-#ifdef WITH_C_PROF
BEGIN_C_TRACE
-#endif
x = (*meth)(self, NULL);
-#ifdef WITH_C_PROF
END_C_TRACE
-#endif
}
else if (flags & METH_O && na == 1) {
PyObject *arg = EXT_POP(*pp_stack);
-#ifdef WITH_C_PROF
BEGIN_C_TRACE
-#endif
x = (*meth)(self, arg);
-#ifdef WITH_C_PROF
END_C_TRACE
-#endif
Py_DECREF(arg);
}
else {
@@ -3530,9 +3527,7 @@
else {
PyObject *callargs;
callargs = load_args(pp_stack, na);
-#ifdef WITH_C_PROF
BEGIN_C_TRACE
-#endif
#ifdef WITH_TSC
rdtscll(*pintr0);
#endif
@@ -3540,9 +3535,7 @@
#ifdef WITH_TSC
rdtscll(*pintr1);
#endif
-#ifdef WITH_C_PROF
END_C_TRACE
-#endif
Py_XDECREF(callargs);
}
} else {