WITHOUT_FRAMEWORKS conditional code bites the dust: this was for

pre-carbon MacOS9 support.

diff --git a/Include/pymactoolbox.h b/Include/pymactoolbox.h
index 916dac71486622e38be72c6e7c8ce21b06aa91ac..cb658626970ca007cb3edde0ef66411fa7f939a3 100644 (file)
--- a/Include/pymactoolbox.h
+++ b/Include/pymactoolbox.h
@@ -7,25 +7,8 @@
        extern "C" {
 #endif
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Memory.h>
-#include <Dialogs.h>
-#include <Menus.h>
-#include <Controls.h>
-#include <Components.h>
-#include <Lists.h>
-#include <Movies.h>
-#include <Errors.h>
-#include <CFBase.h>
-#include <CFArray.h>
-#include <CFData.h>
-#include <CFDictionary.h>
-#include <CFString.h>
-#include <CFURL.h>
-#else
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
-#endif
 
 /*
 ** Helper routines for error codes and such.

diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 12a632f82a5f6f0f9028282fbb219e51bb009215..ec0afa74c5ce733453c931f43248da7fa3657399 100644 (file)
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -21,11 +21,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <ColorPicker.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 #include "Python.h"
 #include "macglue.h"
 #include "pymactoolbox.h"

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index a679df7bb8478960987f02a475ee8b2c597a0c9b..54f852fb315950807463268ce66feecf1510ab2f 100644 (file)
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -32,11 +32,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "macglue.h"
 #include "pymactoolbox.h"
-#ifdef WITHOUT_FRAMEWORKS
-#include <Navigation.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *ErrorObject;
 

diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c
index 2d8b1e2db7639d91f0181550a8d04be44788e3ae..a3ed4b4340a2d5328530863550f3813f22c6d020 100644 (file)
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -9,11 +9,7 @@
 #include "Python.h"
 #include "macglue.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <OpenScripting.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *
 PyOSA_GetAppTerminology(PyObject* self, PyObject* args)

diff --git a/Mac/Modules/gestaltmodule.c b/Mac/Modules/gestaltmodule.c
index 11946a5ff7f3d93bae6b8f4353535be7a9cd4ede..8097de82dc87d9f48543813fd4e752533363ef35 100644 (file)
--- a/Mac/Modules/gestaltmodule.c
+++ b/Mac/Modules/gestaltmodule.c
@@ -27,12 +27,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "macglue.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Types.h>
-#include <Gestalt.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *
 gestalt_gestalt(PyObject *self, PyObject *args)

diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 56c20a3f0734621b61b8f6b8c241e8574005dff4..ee42c59fc047db3d2688e50937b6e3c418f72993 100644 (file)
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -34,11 +34,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <InternetConfig.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *ErrorObject;
 

diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 3217f86e6b848429e56247b3f52c772a57bd7b39..242cf57e684dc8c3e73cf19104915d3dff593513 100644 (file)
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -28,16 +28,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "macglue.h"
 #include "pythonresources.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Windows.h>
-#include <Files.h>
-#include <LowMem.h>
-#include <Sound.h>
-#include <Events.h>
-#else
 #include <Carbon/Carbon.h>
 #include <ApplicationServices/ApplicationServices.h>
-#endif
 
 static PyObject *MacOS_Error; /* Exception MacOS.Error */
 

diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c
index 8b31f7f619e4be5ebf0a3dfec823250194c61a7a..bf101fd88a944e6141ab6505c4b9198c35681366 100644 (file)
--- a/Python/mactoolboxglue.c
+++ b/Python/mactoolboxglue.c
@@ -26,10 +26,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "pymactoolbox.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Script.h>
-#include <Resources.h>
-#endif
 
 /*
 ** Find out what the current script is.