WITHOUT_FRAMEWORKS conditional code bites the dust: this was for

jackjansen · jackjansen · commit 0ffdc39ad20c · 2003-11-19T15:32:46.000Z
pre-carbon MacOS9 support. git-svn-id: http://svn.python.org/projects/python/trunk@34688 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
