From 6fc5aecd5363b22247898e021611b42ceee2a633 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sun, 19 Feb 1995 23:32:59 +0000 Subject: [PATCH] ported back to Think C --- Mac/Modules/snd/Sndmodule.c | 2 +- Mac/Modules/snd/sndsupport.py | 2 +- Mac/Python/macgetargv.c | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c index 7836cf14eda..9f5c24dda45 100644 --- 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 2181cd1e116..fb561e83c98 100644 --- 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 aaf644c4de3..57ec20aecfb 100644 --- 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 #include #include +#include +#include +#include +#include #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 */