summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-06-19 21:49:17 (GMT)
committerGuido van Rossum <guido@python.org>1996-06-19 21:49:17 (GMT)
commit3b4da59cd6dde2e375391bc8b41a469a4aab5fbd (patch)
tree18a732c9ec7b25a99b2809f9b667c8cb6b1c2459
parentd3901028cf587dd9d7bb810eedc95f2efeff9e9d (diff)
downloadcpython-3b4da59cd6dde2e375391bc8b41a469a4aab5fbd.zip
cpython-3b4da59cd6dde2e375391bc8b41a469a4aab5fbd.tar.gz
cpython-3b4da59cd6dde2e375391bc8b41a469a4aab5fbd.tar.bz2
Renamed static pow() to powerop() to avoid name conflict in some compilers.
-rw-r--r--Python/ceval.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 3797792..ec26792 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -68,7 +68,7 @@ static int call_trace
PROTO((object **, object **, frameobject *, char *, object *));
static object *add PROTO((object *, object *));
static object *sub PROTO((object *, object *));
-static object *pow PROTO((object *, object *));
+static object *powerop PROTO((object *, object *));
static object *mul PROTO((object *, object *));
static object *divide PROTO((object *, object *));
static object *mod PROTO((object *, object *));
@@ -665,7 +665,7 @@ eval_code2(co, globals, locals,
case BINARY_POWER:
w = POP();
v = POP();
- x = pow(v, w);
+ x = powerop(v, w);
DECREF(v);
DECREF(w);
PUSH(x);
@@ -2201,11 +2201,11 @@ mod(v, w)
}
static object *
-pow(v, w)
+powerop(v, w)
object *v, *w;
{
object *res;
- BINOP("__pow__", "__rpow__", pow);
+ BINOP("__pow__", "__rpow__", powerop);
if (v->ob_type->tp_as_number == NULL ||
w->ob_type->tp_as_number == NULL) {
err_setstr(TypeError, "pow() requires numeric arguments");