summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-01-17 16:31:01 (GMT)
committerGuido van Rossum <guido@python.org>1995-01-17 16:31:01 (GMT)
commit2ac3bc2c053f8996075ec02b2e6d12d9a171eed5 (patch)
tree44eaadfc86e1b9ab30e56ef756f39d0f0121a737 /Python
parent0865dd9ce96de4467365ea14bea75805d8ddc8c6 (diff)
downloadcpython-2ac3bc2c053f8996075ec02b2e6d12d9a171eed5.zip
cpython-2ac3bc2c053f8996075ec02b2e6d12d9a171eed5.tar.gz
cpython-2ac3bc2c053f8996075ec02b2e6d12d9a171eed5.tar.bz2
rename method arg because of typedef conflict
Diffstat (limited to 'Python')
-rw-r--r--Python/modsupport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 9367684..71bbf6c 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -423,12 +423,12 @@ PyEval_CallFunction(obj, format, va_alist)
#ifdef HAVE_STDARG_PROTOTYPES
object *
-PyEval_CallMethod(object *obj, char *method, char *format, ...)
+PyEval_CallMethod(object *obj, char *methonname, char *format, ...)
#else
object *
-PyEval_CallMethod(obj, method, format, va_alist)
+PyEval_CallMethod(obj, methonname, format, va_alist)
object *obj;
- char *method;
+ char *methonname;
char *format;
va_dcl
#endif
@@ -438,7 +438,7 @@ PyEval_CallMethod(obj, method, format, va_alist)
object *args;
object *res;
- meth = getattr(obj, method);
+ meth = getattr(obj, methonname);
if (meth == NULL)
return NULL;