summaryrefslogtreecommitdiff
path: root/Mac/Modules
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-11-19 15:32:46 +0000
committerJack Jansen <jack.jansen@cwi.nl>2003-11-19 15:32:46 +0000
commita7051b72a6926fe4669c63a66dab8fa9314fc41f (patch)
treedec0a9f45e19c6d13292f39acf531c5b16769c25 /Mac/Modules
parent9284ed156f88997428b4befa553bc8d20ff416f2 (diff)
downloadcpython-a7051b72a6926fe4669c63a66dab8fa9314fc41f.tar.gz
WITHOUT_FRAMEWORKS conditional code bites the dust: this was for
pre-carbon MacOS9 support.
Diffstat (limited to 'Mac/Modules')
-rw-r--r--Mac/Modules/ColorPickermodule.c4
-rw-r--r--Mac/Modules/Nav.c4
-rw-r--r--Mac/Modules/OSATerminology.c4
-rw-r--r--Mac/Modules/gestaltmodule.c5
-rw-r--r--Mac/Modules/icgluemodule.c4
-rw-r--r--Mac/Modules/macosmodule.c8
6 files changed, 0 insertions, 29 deletions
diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 12a632f82a..ec0afa74c5 100644
--- 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 a679df7bb8..54f852fb31 100644
--- 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 2d8b1e2db7..a3ed4b4340 100644
--- 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 11946a5ff7..8097de82dc 100644
--- 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 56c20a3f07..ee42c59fc0 100644
--- 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 3217f86e6b..242cf57e68 100644
--- 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 */