From: Guido van Rossum <guido@python.org>
Date: Tue, 17 Jan 1995 16:31:01 +0000 (+0000)
Subject: rename method arg because of typedef conflict
X-Git-Tag: v1.2b2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac3bc2c053f8996075ec02b2e6d12d9a171eed5;p=thirdparty%2FPython%2Fcpython.git

rename method arg because of typedef conflict
---

diff --git a/Python/modsupport.c b/Python/modsupport.c
index 93676848df10..71bbf6ce1ead 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;