From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 22 May 2001 21:48:40 +0000 (+0000)
Subject: Fixed changed UPP routines names. The module now compiles and loads.
X-Git-Tag: v2.2a3~1692
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1129671350048d9f415d3ba3c411b9bcd8b7ae75;p=thirdparty%2FPython%2Fcpython.git

Fixed changed UPP routines names. The module now compiles and loads.
---

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 934dc878e0b9..ff7724e5306d 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -32,7 +32,11 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "macglue.h"
 #include "pymactoolbox.h"
+#ifdef WITHOUT_FRAMEWORKS
 #include <Navigation.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
 
 static PyObject *ErrorObject;
 
@@ -965,9 +969,9 @@ initNav()
 	/* XXXX Add constants here */
 	
 	/* Set UPPs */
-	my_eventProcUPP = NewNavEventProc(my_eventProc);
-	my_previewProcUPP = NewNavPreviewProc(my_previewProc);
-	my_filterProcUPP = NewNavObjectFilterProc(my_filterProc);
+	my_eventProcUPP = NewNavEventUPP(my_eventProc);
+	my_previewProcUPP = NewNavPreviewUPP(my_previewProc);
+	my_filterProcUPP = NewNavObjectFilterUPP(my_filterProc);
 	
 }