Added more prototypes.

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index e7e64386de618cc56e349485025ccb1ce8c071cf..ba492add5d5b2b15af9ed6250426dc21803f341b 100644 (file)
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -40,7 +40,7 @@ typedef struct {
        double          bg_yield;               /* yield at most so long when in background */
 } PyMacSchedParams;
 
-
+char *PyMac_getscript(void);   /* Get the default encoding for our 8bit character set */
 #ifdef USE_GUSI1
 void PyMac_FixGUSIcd(void);            /* Workaround for GUSI chdir() call */
 extern void PyMac_SetGUSISpin(void);           /* Install our private GUSI spin routine */

diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index 20dd4cb0cea7e2559370b0f20c12d4ffd1de508b..903f292b51c5af1d132a245fac9998bf70858e04 100644 (file)
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -50,6 +50,9 @@ extern int ccommand(char ***);
 #endif
 #endif
 #include <unistd.h>
+#ifdef USE_MAC_SHARED_LIBRARY
+extern PyMac_AddLibResources(void);
+#endif
 
 #define STARTUP "PythonStartup"
 

diff --git a/Mac/Python/macshlglue.c b/Mac/Python/macshlglue.c
index 4b5107067029717259a4032650b6b9a77449ece1..523efc99a1a32454d6e360e3d05bcf499cb8d2b7 100644 (file)
--- a/Mac/Python/macshlglue.c
+++ b/Mac/Python/macshlglue.c
@@ -50,6 +50,12 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <Files.h>
 #include <Resources.h>
 
+/* Defined in the MSL runtime: */
+extern void __initialize(void);
+
+/* Defined either in macglue.c or in a MPW library: */
+extern pascal int PLstrcmp(unsigned char *, unsigned char *);
+
 /*
 ** Variables passed from shared lib initialization to PyMac_AddLibResources.
 */
@@ -64,12 +70,7 @@ OSErr pascal
 __initialize_with_resources(CFragInitBlockPtr data)
 {
        /* Call the MW runtime's initialization routine */
-/* #ifdef __CFM68K__ */
-#if 1
        __initialize();
-#else
-       __sinit();
-#endif
        
        if ( data == nil ) return noErr;
        if ( data->fragLocator.where == kDataForkCFragLocator ) {