summaryrefslogtreecommitdiffstats
path: root/Mac/Wastemods
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-12-09 23:08:54 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-12-09 23:08:54 (GMT)
commitedeea04bfd8342c5339cea701d9c6c08186a1cdb (patch)
tree1920f424b878844752056d408437bae187bcac79 /Mac/Wastemods
parent793ead5696dbb7e0897e459aed2cd64cd1e14788 (diff)
downloadcpython-edeea04bfd8342c5339cea701d9c6c08186a1cdb.zip
cpython-edeea04bfd8342c5339cea701d9c6c08186a1cdb.tar.gz
cpython-edeea04bfd8342c5339cea701d9c6c08186a1cdb.tar.bz2
Mods to make WASTE module compile and link for MachoPython. Not tested
any further, yet.
Diffstat (limited to 'Mac/Wastemods')
-rw-r--r--Mac/Wastemods/WEObjectHandlers.h4
-rw-r--r--Mac/Wastemods/WETabHooks.h3
-rw-r--r--Mac/Wastemods/WETabs.c2
-rw-r--r--Mac/Wastemods/WETabs.h3
4 files changed, 10 insertions, 2 deletions
diff --git a/Mac/Wastemods/WEObjectHandlers.h b/Mac/Wastemods/WEObjectHandlers.h
index d73a490..ac6e567 100644
--- a/Mac/Wastemods/WEObjectHandlers.h
+++ b/Mac/Wastemods/WEObjectHandlers.h
@@ -5,7 +5,9 @@
Copyright © 1993-1998 Marco Piovanelli
All Rights Reserved
*/
-
+#ifndef WITHOUT_FRAMEWORKS
+#include <Carbon/Carbon.h>
+#endif
#ifndef _WASTE_
#include "WASTE.h"
#endif
diff --git a/Mac/Wastemods/WETabHooks.h b/Mac/Wastemods/WETabHooks.h
index 6405426..635db74 100644
--- a/Mac/Wastemods/WETabHooks.h
+++ b/Mac/Wastemods/WETabHooks.h
@@ -10,6 +10,9 @@
*/
+#ifndef WITHOUT_FRAMEWORKS
+#include <Carbon/Carbon.h>
+#endif
#ifndef _WASTE_
#include "WASTE.h"
#endif
diff --git a/Mac/Wastemods/WETabs.c b/Mac/Wastemods/WETabs.c
index 6f59e37..1a0291e 100644
--- a/Mac/Wastemods/WETabs.c
+++ b/Mac/Wastemods/WETabs.c
@@ -10,7 +10,7 @@
#include "WETabs.h"
#include "WETabHooks.h"
-#ifndef __ERRORS__
+#if !defined(__ERRORS__) && defined(WITHOUT_FRAMEWORKS)
#include <Errors.h>
#endif
diff --git a/Mac/Wastemods/WETabs.h b/Mac/Wastemods/WETabs.h
index 4a91d7c..0b2c0f3 100644
--- a/Mac/Wastemods/WETabs.h
+++ b/Mac/Wastemods/WETabs.h
@@ -12,6 +12,9 @@
*/
+#ifndef WITHOUT_FRAMEWORKS
+#include <Carbon/Carbon.h>
+#endif
#ifndef _WASTE_
#include "WASTE.h"
#endif