diff options
| author | das <das> | 2004-03-17 18:15:28 (GMT) |
|---|---|---|
| committer | das <das> | 2004-03-17 18:15:28 (GMT) |
| commit | 65423864cf9618016945cddd968b3f2c4343dcfc (patch) | |
| tree | a4d842ff3e2a8fc34e8fd25e2322f00537fdfae9 /xlib/X11 | |
| parent | a69b5b4fefe30134396d6269d0eca5fff4ba8500 (diff) | |
| download | tk-65423864cf9618016945cddd968b3f2c4343dcfc.zip tk-65423864cf9618016945cddd968b3f2c4343dcfc.tar.gz tk-65423864cf9618016945cddd968b3f2c4343dcfc.tar.bz2 | |
Removed support for Mac OS Classic platform [Patch 918139]
Diffstat (limited to 'xlib/X11')
| -rw-r--r-- | xlib/X11/X.h | 4 | ||||
| -rw-r--r-- | xlib/X11/Xlib.h | 15 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 | ||||
| -rw-r--r-- | xlib/X11/keysym.h | 4 |
4 files changed, 7 insertions, 20 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index 7755cac..bdc4f13 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -33,7 +33,7 @@ SOFTWARE. #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) # define Cursor XCursor # define Region XRegion #endif @@ -669,7 +669,7 @@ are reserved in the protocol for errors and replies. */ #define LSBFirst 0 #define MSBFirst 1 -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 252b11d..3af3682 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -27,14 +27,9 @@ #define XlibSpecificationRelease 5 -#if !defined(MAC_TCL) && !defined(MAC_OSX_TK) +#if !defined(MAC_OSX_TK) # include <X11/X.h> #endif -#ifdef MAC_TCL -# include <X.h> -# define Cursor XCursor -# define Region XRegion -#endif #ifdef MAC_OSX_TK # include <X11/X.h> # define Cursor XCursor @@ -42,11 +37,7 @@ #endif /* applications should not depend on these two headers being included! */ -#ifdef MAC_TCL -#include <Xfuncproto.h> -#else #include <X11/Xfuncproto.h> -#endif #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV @@ -64,7 +55,7 @@ typedef unsigned long wchar_t; typedef char *XPointer; #define Bool int -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) /* Use define rather than typedef, since may need to undefine this later */ #define Status int #else @@ -1206,7 +1197,7 @@ _XFUNCPROTOBEGIN _XFUNCPROTOEND -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index 8812c80..e42ed5d 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -29,7 +29,7 @@ SOFTWARE. /* You must include <X11/Xlib.h> before including this file */ -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) # define Region XRegion #endif @@ -848,7 +848,7 @@ extern void XXorRegion( _XFUNCPROTOEND -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_OSX_TK) # undef Region #endif diff --git a/xlib/X11/keysym.h b/xlib/X11/keysym.h index 027afe0..a8f1408 100644 --- a/xlib/X11/keysym.h +++ b/xlib/X11/keysym.h @@ -32,8 +32,4 @@ SOFTWARE. #define XK_LATIN4 #define XK_GREEK -#ifdef MAC_TCL -#include <keysymdef.h> -#else #include <X11/keysymdef.h> -#endif |