ported back to Think C

diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index 7836cf14eda7ce506fde978ffb09f59105c0cada..9f5c24dda45014161d3165f057e7b9f11cb92820 100644 (file)
--- a/Mac/Modules/snd/Sndmodule.c
+++ b/Mac/Modules/snd/Sndmodule.c
@@ -36,7 +36,7 @@ extern PyObject *WinObj_WhichWindow(WindowPtr);
 
 #ifndef HAVE_UNIVERSAL_HEADERS
 #define SndCallBackUPP ProcPtr
-#define NewSndCallBackProc(x) (x)
+#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x))
 #define SndListHandle Handle
 #endif
 

diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index 2181cd1e1167443ffaf4ecc996d3488b2389fa82..fb561e83c9807ff0f6092aa10d7ec68139ab6935 100644 (file)
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -21,7 +21,7 @@ includestuff = includestuff + """
 
 #ifndef HAVE_UNIVERSAL_HEADERS
 #define SndCallBackUPP ProcPtr
-#define NewSndCallBackProc(x) (x)
+#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x))
 #define SndListHandle Handle
 #endif
 """

diff --git a/Mac/Python/macgetargv.c b/Mac/Python/macgetargv.c
index aaf644c4de322086436e152c7010a64cc94cf86d..57ec20aecfb61ad2bbebad9de85b39e7926a937f 100644 (file)
--- a/Mac/Python/macgetargv.c
+++ b/Mac/Python/macgetargv.c
@@ -41,6 +41,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <AEObjects.h>
 #include <Desk.h>
 #include <Fonts.h>
+#include <TextEdit.h>
+#include <Menus.h>
+#include <Dialogs.h>
+#include <Windows.h>
 
 #ifdef GENERATINGCFM   /* Defined to 0 or 1 in Universal headers */
 #define HAVE_UNIVERSAL_HEADERS
@@ -147,7 +151,6 @@ get_application_name()
 {
        static char appname[256];
        FSSpec appspec;
-       long size;
        
        if (current_process_location(&appspec))
                return NULL;
@@ -282,6 +285,9 @@ event_loop()
 static void
 init_mac_world()
 {
+#ifdef THINK_C
+       printf("\n");
+#else
        MaxApplZone();
        InitGraf(&qd.thePort);
        InitFonts();
@@ -290,6 +296,7 @@ init_mac_world()
        InitDialogs((long)0);
        InitMenus();
        InitCursor();
+#endif
 }
 /* Get the argv vector, return argc */