Squashed compiler warnings by adding casts, making sure prototypes are in

jackjansen · jackjansen · commit 0a116f3a2901 · 2002-12-23T21:03:36.000Z
scope and looking at types.
diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -421,7 +421,7 @@ calculate_path(void)
 	*/
     pythonModule = NSModuleForSymbol(NSLookupAndBindSymbol("_Py_Initialize"));
     /* Use dylib functions to find out where the framework was loaded from */
-    buf = NSLibraryNameForModule(pythonModule);
+    buf = (char *)NSLibraryNameForModule(pythonModule);
     if (buf != NULL) {
         /* We're in a framework. */
         /* See if we might be in the build directory. The framework in the
diff --git a/Modules/main.c b/Modules/main.c
@@ -13,6 +13,10 @@ extern PyObject* pyvms_gr_empty_string;
 #include <fcntl.h>
 #endif
 
+#if defined(WITH_NEXT_FRAMEWORK)
+#include "pymactoolbox.h"
+#endif
+
 #if (defined(PYOS_OS2) && !defined(PYCC_GCC)) || defined(MS_WINDOWS)
 #define PYTHONHOMEHELP "<prefix>\\lib"
 #else
diff --git a/Python/dynload_next.c b/Python/dynload_next.c
@@ -77,7 +77,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
 		newModule = NSLinkModule(image, pathname, LINKOPTIONS);
 		if (newModule == NULL) {
 			int errNo;
-			char *fileName, *moreErrorStr;
+			const char *fileName, *moreErrorStr;
 			NSLinkEditErrors c;
 			NSLinkEditError( &c, &errNo, &fileName, &moreErrorStr );
 			PyOS_snprintf(errBuf, 512, "Failure linking new module: %s: %s", 
diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c
@@ -53,7 +53,7 @@ char *PyMac_getscript()
         /* This leaks a an object. */
         name = CFStringConvertEncodingToIANACharSetName(enc);
     }
-    return CFStringGetCStringPtr(name, 0); 
+    return (char *)CFStringGetCStringPtr(name, 0); 
 #else
    int font, script, lang;
     font = 0;

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ char *PyMac_getscript()`
`53`	`53`	`/* This leaks a an object. */`
`54`	`54`	`name = CFStringConvertEncodingToIANACharSetName(enc);`
`55`	`55`	`}`
`56`		`- return CFStringGetCStringPtr(name, 0);`
	`56`	`+ return (char *)CFStringGetCStringPtr(name, 0);`
`57`	`57`	`#else`
`58`	`58`	`int font, script, lang;`
`59`	`59`	`font = 0;`