From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 11 Jul 2000 21:12:55 +0000 (+0000)
Subject: Fiddled declaration/implementation of setcallback() so that it is ansifyable.
X-Git-Tag: v2.0b1~886
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85152b93cb5f910f7345d623e9c057aa1d2ca6e0;p=thirdparty%2FPython%2Fcpython.git

Fiddled declaration/implementation of setcallback() so that it is ansifyable.
---

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index cafe0d6645f9..863276773b26 100644
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -93,6 +93,9 @@ static ControlUserPaneTrackingUPP mytrackingproc_upp;
 
 extern int settrackfunc(PyObject *); 	/* forward */
 extern void clrtrackfunc(void);	/* forward */
+#ifndef TARGET_API_MAC_CARBON_NOTYET
+staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
+#endif
 
 static PyObject *Ctl_Error;
 
@@ -1441,7 +1444,7 @@ static PyObject *CtlObj_SetControlDataCallback(_self, _args)
 	ControlPartCode inPart;
 	ResType inTagName;
 	PyObject *callback;
-	UniversalProcPtr *c_callback;
+	UniversalProcPtr c_callback;
 
 	if (!PyArg_ParseTuple(_args, "hO&O",
 	                      &inPart,
@@ -1449,7 +1452,7 @@ static PyObject *CtlObj_SetControlDataCallback(_self, _args)
 	                      &callback))
 		return NULL;
 
-	if ( setcallback(_self, inTagName, callback, &c_callback) < 0 )
+	if ( setcallback((PyObject *)_self, inTagName, callback, &c_callback) < 0 )
 		return NULL;
 	_err = SetControlData(_self->ob_itself,
 		              inPart,
@@ -2164,12 +2167,13 @@ mytracker(ControlHandle ctl, short part)
 
 #ifndef TARGET_API_MAC_CARBON_NOTYET
 static int
-setcallback(self, which, callback, uppp)
-	ControlObject *self;
+setcallback(myself, which, callback, uppp)
+	PyObject *myself;
 	OSType which;
 	PyObject *callback;
 	UniversalProcPtr *uppp;
 {
+	ControlObject *self = (ControlObject *)myself;
 	char keybuf[9];
 	
 	if ( which == kControlUserPaneDrawProcTag )
diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index 0623400eb3ab..30c44912d1a3 100644
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -93,6 +93,9 @@ static ControlUserPaneTrackingUPP mytrackingproc_upp;
 
 extern int settrackfunc(PyObject *); 	/* forward */
 extern void clrtrackfunc(void);	/* forward */
+#ifndef TARGET_API_MAC_CARBON_NOTYET
+staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
+#endif
 """
 
 finalstuff = finalstuff + """
@@ -165,12 +168,13 @@ mytracker(ControlHandle ctl, short part)
 
 #ifndef TARGET_API_MAC_CARBON_NOTYET
 static int
-setcallback(self, which, callback, uppp)
-	ControlObject *self;
+setcallback(myself, which, callback, uppp)
+	PyObject *myself;
 	OSType which;
 	PyObject *callback;
 	UniversalProcPtr *uppp;
 {
+	ControlObject *self = (ControlObject *)myself;
 	char keybuf[9];
 	
 	if ( which == kControlUserPaneDrawProcTag )
@@ -544,7 +548,7 @@ OSErr _err;
 ControlPartCode inPart;
 ResType inTagName;
 PyObject *callback;
-UniversalProcPtr *c_callback;
+UniversalProcPtr c_callback;
 
 if (!PyArg_ParseTuple(_args, "hO&O",
                       &inPart,
@@ -552,7 +556,7 @@ if (!PyArg_ParseTuple(_args, "hO&O",
                       &callback))
 	return NULL;
 
-if ( setcallback(_self, inTagName, callback, &c_callback) < 0 )
+if ( setcallback((PyObject *)_self, inTagName, callback, &c_callback) < 0 )
 	return NULL;
 _err = SetControlData(_self->ob_itself,
 	              inPart,