Define PyDoc_STR if it isn't defined. This makes these modules compile

for Python 2.2.

diff --git a/Mac/Modules/help/_Helpmodule.c b/Mac/Modules/help/_Helpmodule.c
index 328bc3af1145383a702628bb6170ced34cf94353..66abdeb398b2172af867e0480830e5ab894bf728 100644 (file)
--- a/Mac/Modules/help/_Helpmodule.c
+++ b/Mac/Modules/help/_Helpmodule.c
@@ -20,6 +20,9 @@
     }} while(0)
 
 
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef WITHOUT_FRAMEWORKS
 #include <MacHelp.h>
 #else

diff --git a/Mac/Modules/help/helpsupport.py b/Mac/Modules/help/helpsupport.py
index 26fa054b0ea544668c0c1cf7f879759ebf909f65..34b687198a78d6ed2cf1f28f03fd3d8bf9902550 100644 (file)
--- a/Mac/Modules/help/helpsupport.py
+++ b/Mac/Modules/help/helpsupport.py
@@ -36,6 +36,9 @@ MenuItemIndex = Type("MenuItemIndex", "H")
 #EventKind = Type("EventKind", "H")
 
 includestuff = includestuff + """
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef WITHOUT_FRAMEWORKS
 #include <MacHelp.h>
 #else

diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c
index 5665c47b10537793295f22dcd3dc5c930560150d..421b9d7c823ce3f8fa7c8b7ff28e3065a39b5f64 100644 (file)
--- a/Mac/Modules/res/_Resmodule.c
+++ b/Mac/Modules/res/_Resmodule.c
@@ -20,6 +20,9 @@
     }} while(0)
 
 
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef WITHOUT_FRAMEWORKS
 #include <Resources.h>
 #include <string.h>

diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py
index 30c44453906e2766ec604cc0bee570b69bcaa63c..c0bfc8ac1827e050646a957a28832f2103ef4575 100644 (file)
--- a/Mac/Modules/res/ressupport.py
+++ b/Mac/Modules/res/ressupport.py
@@ -25,6 +25,9 @@ FSCatalogInfo_ptr = FakeType("(FSCatalogInfo *)0")
 # includestuff etc. are imported from macsupport
 
 includestuff = includestuff + """
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef WITHOUT_FRAMEWORKS
 #include <Resources.h>
 #include <string.h>

diff --git a/Mac/Modules/scrap/_Scrapmodule.c b/Mac/Modules/scrap/_Scrapmodule.c
index 4b3d86584bcf2ca7276c80a7606c9a475fa79a45..b12db06d143dc198261675029d99304d7cc75bfd 100644 (file)
--- a/Mac/Modules/scrap/_Scrapmodule.c
+++ b/Mac/Modules/scrap/_Scrapmodule.c
@@ -5,6 +5,9 @@
 
 
 
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef _WIN32
 #include "pywintoolbox.h"
 #else

diff --git a/Mac/Modules/scrap/scrapsupport.py b/Mac/Modules/scrap/scrapsupport.py
index 65525be22904f18d53528a7a6625836c89c65e94..57d7578a63f20155d2da8046420648a5df5619a2 100644 (file)
--- a/Mac/Modules/scrap/scrapsupport.py
+++ b/Mac/Modules/scrap/scrapsupport.py
@@ -26,6 +26,9 @@ from macsupport import *
 ScrapRef = OpaqueByValueType(OBJECTTYPE, OBJECTPREFIX)
 
 includestuff = includestuff + """
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 #ifdef WITHOUT_FRAMEWORKS
 #include <Scrap.h>
 #else

diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index dd77cefa715e8d94935678a2ad71e514d23800df..e50107452cd46c451e731281e9ba596fe6b04c69 100644 (file)
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -23,6 +23,9 @@
 #include <WASTE.h>
 #include <WEObjectHandlers.h>
 #include <WETabs.h>
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 
 /* Exported by Qdmodule.c: */
 extern PyObject *QdRGB_New(RGBColor *);

diff --git a/Mac/Modules/waste/wastescan.py b/Mac/Modules/waste/wastescan.py
index b0644ecf66fc9313e5034b41aa13b8a930c5a27f..bb186aa808295f684bc13b452267d85fd81d67da 100644 (file)
--- a/Mac/Modules/waste/wastescan.py
+++ b/Mac/Modules/waste/wastescan.py
@@ -6,7 +6,7 @@ from bgenlocations import TOOLBOXDIR, BGENDIR
 sys.path.append(BGENDIR)
 from scantools import Scanner
 
-WASTEDIR='/Applications/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/MacOS Support/(Third Party Support)/Waste 2.0 Distribution/C_C++ Headers/'
+WASTEDIR='/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/MacOS Support/(Third Party Support)/Waste 2.0 Distribution/C_C++ Headers/'
                
 if not os.path.exists(WASTEDIR):
        raise 'Error: not found: %s', WASTEDIR

diff --git a/Mac/Modules/waste/wastesupport.py b/Mac/Modules/waste/wastesupport.py
index 40701c5d070a0413ae876f35a750a39c3dad5fc2..674f9f94f08d36aac1f56f63e6051b8a2fe2d39e 100644 (file)
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -63,6 +63,9 @@ includestuff = includestuff + """
 #include <%s>""" % MACHEADERFILE + """
 #include <WEObjectHandlers.h>
 #include <WETabs.h>
+#ifndef PyDoc_STR
+#define PyDoc_STR(x) (x)
+#endif
 
 /* Exported by Qdmodule.c: */
 extern PyObject *QdRGB_New(RGBColor *);