Skip to content

Commit eddc144

Browse files
jackjansenjackjansen
committed
Getting rid of all the code inside #ifdef macintosh too.
1 parent 4bae2d5 commit eddc144

File tree

19 files changed

+6
-458
lines changed

19 files changed

+6
-458
lines changed

‎Include/osdefs.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ extern "C" {
77

88
/* Operating system dependencies */
99

10-
#ifdef macintosh
11-
#define SEP ':'
12-
#define MAXPATHLEN 256
13-
/* Mod by Jack: newline is less likely to occur in filenames than space */
14-
#define DELIM '\n'
15-
#endif
16-
1710
/* Mod by chrish: QNX has WATCOM, but isn't DOS */
1811
#if !defined(__QNX__)
1912
#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2)

‎Include/structmember.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ typedef struct PyMemberDef {
6363

6464
/* Added by Jack: strings contained in the structure */
6565
#define T_STRING_INPLACE 13
66-
#ifdef macintosh
67-
#define T_PSTRING 14 /* macintosh pascal-style counted string */
68-
#define T_PSTRING_INPLACE 15
69-
#endif /* macintosh */
7066

7167
#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError
7268
when the value is NULL, instead of

‎Mac/Include/macglue.h‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -31,56 +31,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3131
extern "C" {
3232
#endif
3333

34-
/* Scheduler parameters */
35-
typedef struct {
36-
int check_interrupt; /* if true check for command-dot */
37-
int process_events; /* if nonzero enable evt processing, this mask */
38-
int besocial; /* Be social, give up CPU now and again */
39-
double check_interval; /* how often to check */
40-
double bg_yield; /* yield at most so long when in background */
41-
} PyMacSchedParams;
42-
43-
unsigned char *Pstring(char *str); /* Convert c-string to pascal-string in static buffer */
44-
45-
extern short PyMac_AppRefNum; /* RefNum of application rsrcfork (from macmain.c) */
46-
extern FSSpec PyMac_ApplicationFSSpec; /* Application location (from macargv.c) */
47-
extern char PyMac_ApplicationPath[]; /* Application location (from macargv.c) */
48-
extern OSErr PyMac_init_application_location(void); /* Init the above */
49-
extern int PyMac_GetArgv(char ***, int); /* Get argc, argv (from macargv.c) */
50-
5134
extern PyObject *PyMac_OSErrException; /* Exception for OSErr */
5235
PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */
53-
54-
int PyMac_HandleEvent(EventRecord *); /* Handle one event, possibly in Python */
55-
void PyMac_HandleEventIntern(EventRecord *); /* Handle one event internal only */
56-
int PyMac_SetEventHandler(PyObject *); /* set python-coded event handler */
57-
58-
int PyMac_FindResourceModule(PyStringObject *, char *, char *); /* Test for 'PYC ' resource in a file */
59-
PyObject * PyMac_LoadResourceModule(char *, char *); /* Load 'PYC ' resource from file */
60-
int PyMac_FindCodeResourceModule(PyStringObject *, char *, char *); /* Test for 'PYD ' resource in a file */
61-
PyObject * PyMac_LoadCodeResourceModule(char *, char *); /* Load 'PYD ' resource from file */
62-
struct filedescr *PyMac_FindModuleExtension(char *, size_t *, char *); /* Look for module in single folder */
63-
64-
void PyMac_InitApplet(void); /* Initialize and run an Applet */
65-
void PyMac_Initialize(void); /* Initialize function for embedding Python */
66-
67-
68-
/* From macfiletype.c: */
69-
70-
long PyMac_getfiletype(char *); /* Get file type */
71-
int PyMac_setfiletype(char *, long, long); /* Set file creator and type */
72-
73-
/* from macmain.c: */
74-
void PyMac_Exit(int);
75-
void PyMac_InitApplication(void);
76-
void PyMac_OutputSeen(void);
77-
void PyMac_OutputNotSeen(void);
78-
int PyMac_GetDelayConsoleFlag(void);
79-
80-
/* from macgetargv: */
81-
OSErr PyMac_init_process_location(void);
82-
char * strdup(const char *str);
83-
8436
#ifdef __cplusplus
8537
}
8638
#endif

‎Modules/_hotshot.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ typedef __int64 hs_time;
2626
#ifndef HAVE_GETTIMEOFDAY
2727
#error "This module requires gettimeofday() on non-Windows platforms!"
2828
#endif
29-
#if defined(macintosh) || (defined(PYOS_OS2) && defined(PYCC_GCC))
29+
#if (defined(PYOS_OS2) && defined(PYCC_GCC))
3030
#include <sys/time.h>
3131
#else
3232
#include <sys/resource.h>
@@ -47,10 +47,6 @@ typedef struct timeval hs_time;
4747

4848
#define BUFFERSIZE 10240
4949

50-
#ifdef macintosh
51-
#define PATH_MAX 254
52-
#endif
53-
5450
#if defined(PYOS_OS2) && defined(PYCC_GCC)
5551
#define PATH_MAX 260
5652
#endif
@@ -940,7 +936,7 @@ calibrate(void)
940936
}
941937
#endif
942938
}
943-
#if defined(MS_WINDOWS) || defined(macintosh) || defined(PYOS_OS2) || \
939+
#if defined(MS_WINDOWS) || defined(PYOS_OS2) || \
944940
defined(__VMS)
945941
rusage_diff = -1;
946942
#else

‎Modules/_tkinter.c‎

Lines changed: 1 addition & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ Copyright (C) 1994 Steen Lumholt.
3333
#include <windows.h>
3434
#endif
3535

36-
#ifdef macintosh
37-
#define MAC_TCL
38-
#endif
39-
4036
/* Allow using this code in Python 2.[12] */
4137
#ifndef PyDoc_STRVAR
4238
#define PyDoc_STRVAR(name,str) static char name[] = str
@@ -96,15 +92,7 @@ Copyright (C) 1994 Steen Lumholt.
9692
#error "unsupported Tcl configuration"
9793
#endif
9894

99-
#if defined(macintosh)
100-
/* Sigh, we have to include this to get at the tcl qd pointer */
101-
#include <tkMac.h>
102-
/* And this one we need to clear the menu bar */
103-
#include <Menus.h>
104-
#endif
105-
106-
#if !(defined(MS_WINDOWS) || defined(__CYGWIN__) || defined(macintosh))
107-
/* Mac has it, but it doesn't really work:-( */
95+
#if !(defined(MS_WINDOWS) || defined(__CYGWIN__))
10896
#define HAVE_CREATEFILEHANDLER
10997
#endif
11098

@@ -238,29 +226,6 @@ static PyThreadState *tcl_tstate = NULL;
238226

239227
#endif
240228

241-
#ifdef macintosh
242-
243-
/*
244-
** Additional cruft needed by Tcl/Tk on the Mac.
245-
** This is for Tcl 7.5 and Tk 4.1 (patch release 1).
246-
*/
247-
248-
/* ckfree() expects a char* */
249-
#define FREECAST (char *)
250-
251-
#include <Events.h> /* For EventRecord */
252-
253-
typedef int (*TclMacConvertEventPtr) (EventRecord *eventPtr);
254-
void Tcl_MacSetEventProc(TclMacConvertEventPtr procPtr);
255-
int TkMacConvertEvent(EventRecord *eventPtr);
256-
257-
static int PyMacConvertEvent(EventRecord *eventPtr);
258-
259-
#include <SIOUX.h>
260-
extern int SIOUXIsAppWindow(WindowPtr);
261-
262-
#endif /* macintosh */
263-
264229
#ifndef FREECAST
265230
#define FREECAST (char *)
266231
#endif
@@ -646,12 +611,6 @@ Tkapp_New(char *screenName, char *baseName, char *className,
646611
v->ProcBodyType = Tcl_GetObjType("procbody");
647612
v->StringType = Tcl_GetObjType("string");
648613

649-
#if defined(macintosh)
650-
/* This seems to be needed */
651-
ClearMenuBar();
652-
TkMacInitMenus(v->interp);
653-
#endif
654-
655614
/* Delete the 'exit' command, which can screw things up */
656615
Tcl_DeleteCommand(v->interp, "exit");
657616

@@ -3092,112 +3051,4 @@ init_tkinter(void)
30923051
Py_AtExit(Tcl_Finalize);
30933052
#endif
30943053

3095-
#ifdef macintosh
3096-
/*
3097-
** Part of this code is stolen from MacintoshInit in tkMacAppInit.
3098-
** Most of the initializations in that routine (toolbox init calls and
3099-
** such) have already been done for us, so we only need these.
3100-
*/
3101-
tcl_macQdPtr = &qd;
3102-
3103-
Tcl_MacSetEventProc(PyMacConvertEvent);
3104-
#if GENERATINGCFM
3105-
mac_addlibresources();
3106-
#endif /* GENERATINGCFM */
3107-
#endif /* macintosh */
31083054
}
3109-
3110-
3111-
3112-
#ifdef macintosh
3113-
3114-
/*
3115-
** Anyone who embeds Tcl/Tk on the Mac must define panic().
3116-
*/
3117-
3118-
void
3119-
panic(char * format, ...)
3120-
{
3121-
va_list varg;
3122-
3123-
va_start(varg, format);
3124-
3125-
vfprintf(stderr, format, varg);
3126-
(void) fflush(stderr);
3127-
3128-
va_end(varg);
3129-
3130-
Py_FatalError("Tcl/Tk panic");
3131-
}
3132-
3133-
/*
3134-
** Pass events to SIOUX before passing them to Tk.
3135-
*/
3136-
3137-
static int
3138-
PyMacConvertEvent(EventRecord *eventPtr)
3139-
{
3140-
WindowPtr frontwin;
3141-
/*
3142-
** Sioux eats too many events, so we don't pass it everything. We
3143-
** always pass update events to Sioux, and we only pass other events if
3144-
** the Sioux window is frontmost. This means that Tk menus don't work
3145-
** in that case, but at least we can scroll the sioux window.
3146-
** Note that the SIOUXIsAppWindow() routine we use here is not really
3147-
** part of the external interface of Sioux...
3148-
*/
3149-
frontwin = FrontWindow();
3150-
if ( eventPtr->what == updateEvt || SIOUXIsAppWindow(frontwin) ) {
3151-
if (SIOUXHandleOneEvent(eventPtr))
3152-
return 0; /* Nothing happened to the Tcl event queue */
3153-
}
3154-
return TkMacConvertEvent(eventPtr);
3155-
}
3156-
3157-
#if GENERATINGCFM
3158-
3159-
/*
3160-
** Additional Mac specific code for dealing with shared libraries.
3161-
*/
3162-
3163-
#include <Resources.h>
3164-
#include <CodeFragments.h>
3165-
3166-
static int loaded_from_shlib = 0;
3167-
static FSSpec library_fss;
3168-
3169-
/*
3170-
** If this module is dynamically loaded the following routine should
3171-
** be the init routine. It takes care of adding the shared library to
3172-
** the resource-file chain, so that the tk routines can find their
3173-
** resources.
3174-
*/
3175-
OSErr pascal
3176-
init_tkinter_shlib(CFragInitBlockPtr data)
3177-
{
3178-
__initialize();
3179-
if ( data == nil ) return noErr;
3180-
if ( data->fragLocator.where == kDataForkCFragLocator ) {
3181-
library_fss = *data->fragLocator.u.onDisk.fileSpec;
3182-
loaded_from_shlib = 1;
3183-
} else if ( data->fragLocator.where == kResourceCFragLocator ) {
3184-
library_fss = *data->fragLocator.u.inSegs.fileSpec;
3185-
loaded_from_shlib = 1;
3186-
}
3187-
return noErr;
3188-
}
3189-
3190-
/*
3191-
** Insert the library resources into the search path. Put them after
3192-
** the resources from the application. Again, we ignore errors.
3193-
*/
3194-
static
3195-
mac_addlibresources(void)
3196-
{
3197-
if ( !loaded_from_shlib )
3198-
return;
3199-
(void)FSpOpenResFile(&library_fss, fsRdPerm);
3200-
}
3201-
3202-
#endif /* GENERATINGCFM */
3203-
#endif /* macintosh */

‎Modules/getbuildinfo.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#include "Python.h"
22

3-
#ifdef macintosh
4-
#include "macbuildno.h"
5-
#endif
6-
73
#ifndef DONT_HAVE_STDIO_H
84
#include <stdio.h>
95
#endif

‎Modules/parsermodule.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
#define NOTE(x)
4040
#endif
4141

42-
#ifdef macintosh
43-
char *strdup(char *);
44-
#endif
45-
4642
/* String constants used to initialize module attributes.
4743
*
4844
*/

0 commit comments

Comments
 (0)