More complete purge of things only present for supporting long-dead Mac 9 systems.

6 files changed, 11 insertions, 35 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 8534768..7348e90 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
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 083731a..c7c4739 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -13,15 +13,9 @@
 
 #include <tkInt.h>
 
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#if !defined(MAC_OSX_TK)
 #	include <X11/Xlib.h>
 #endif
-#ifdef MAC_TCL
-#	include <Xlib.h>
-#	include <X.h>
-#	define Cursor XCursor
-#	define Region XRegion
-#endif
 #ifdef MAC_OSX_TK
 #	include <tkMacOSXInt.h>
 #	include <X11/Xlib.h>
@@ -513,7 +507,7 @@ XDrawPoints(display, d, gc, points, npoints, mode)
     }
 }
 
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#if !defined(MAC_OSX_TK)
 void
 XDrawSegments(display, d, gc, segments, nsegments)
     Display* display;
diff --git a/xlib/xutil.c b/xlib/xutil.c
index 23b589c..d40dbe5 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -12,13 +12,8 @@
 #include <stdlib.h>
 #include <tk.h>
 
-#ifdef MAC_TCL
-#       include <Xutil.h>
-#       include <Xatom.h>
-#else
-#       include <X11/Xutil.h>
-#       include <X11/Xatom.h>
-#endif
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
 
 /*
  *----------------------------------------------------------------------