diff options
| author | wolfsuit <wolfsuit> | 2001-10-15 09:21:59 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2001-10-15 09:21:59 (GMT) |
| commit | a3014412e50718ef8e18906598145caab4b898f0 (patch) | |
| tree | 7105a93a860c8f55a94974a10b6fdfe6c6dd8a2f /xlib/X11 | |
| parent | 343a12a735abd601b4cd5c087be337a51851adb6 (diff) | |
| download | tk-a3014412e50718ef8e18906598145caab4b898f0.zip tk-a3014412e50718ef8e18906598145caab4b898f0.tar.gz tk-a3014412e50718ef8e18906598145caab4b898f0.tar.bz2 | |
First checkin of support for Tk on Mac OS X.
Diffstat (limited to 'xlib/X11')
| -rw-r--r-- | xlib/X11/X.h | 4 | ||||
| -rw-r--r-- | xlib/X11/Xlib.h | 13 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index 8b37559..a86fd26 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 */ -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) # 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 -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index e8723dd..7edbebc 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -27,12 +27,18 @@ #define XlibSpecificationRelease 5 +#if !defined(MAC_TCL) && !defined(MAC_OSX_TCL) +# include <X11/X.h> +#endif #ifdef MAC_TCL # include <X.h> # define Cursor XCursor # define Region XRegion -#else +#endif +#ifdef MAC_OSX_TCL # include <X11/X.h> +# define Cursor XCursor +# define Region XRegion #endif /* applications should not depend on these two headers being included! */ @@ -58,7 +64,8 @@ typedef unsigned long wchar_t; typedef char *XPointer; #define Bool int -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +/* Use define rather than typedef, since may need to undefine this later */ #define Status int #else typedef int Status; @@ -1199,7 +1206,7 @@ _XFUNCPROTOBEGIN _XFUNCPROTOEND -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index f6c0a36..6913c12 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 */ -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) # define Region XRegion #endif @@ -848,7 +848,7 @@ extern void XXorRegion( _XFUNCPROTOEND -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TCL) # undef Region #endif |