summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-02-19 23:32:59 (GMT)
committerGuido van Rossum <guido@python.org>1995-02-19 23:32:59 (GMT)
commit6fc5aecd5363b22247898e021611b42ceee2a633 (patch)
treeedb980ad09d4204645b1b19e0de9d6db573a5ce8
parent9784295b157ac9db30d52708f67d115c397290ab (diff)
downloadcpython-6fc5aecd5363b22247898e021611b42ceee2a633.zip
cpython-6fc5aecd5363b22247898e021611b42ceee2a633.tar.gz
cpython-6fc5aecd5363b22247898e021611b42ceee2a633.tar.bz2
ported back to Think C
-rw-r--r--Mac/Modules/snd/Sndmodule.c2
-rw-r--r--Mac/Modules/snd/sndsupport.py2
-rw-r--r--Mac/Python/macgetargv.c9
3 files changed, 10 insertions, 3 deletions
diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index 7836cf1..9f5c24d 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 2181cd1..fb561e8 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 aaf644c..57ec20a 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 <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 */