summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mac/Include/macglue.h2
-rw-r--r--Mac/Python/macmain.c3
-rw-r--r--Mac/Python/macshlglue.c11
3 files changed, 10 insertions, 6 deletions
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index e7e6438..ba492ad 100644
--- 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 20dd4cb..903f292 100644
--- 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 4b51070..523efc9 100644
--- 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 ) {