#define XlibSpecificationRelease 5
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+# include <X11/X.h>
+#endif
#ifdef MAC_TCL
# include <X.h>
# define Cursor XCursor
# define Region XRegion
-#else
+#endif
+#ifdef MAC_OSX_TK
# include <X11/X.h>
+# define Cursor XCursor
+# define Region XRegion
#endif
/* applications should not depend on these two headers being included! */
typedef char *XPointer;
#define Bool int
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+/* Use define rather than typedef, since may need to undefine this later */
#define Status int
#else
typedef int Status;
_XFUNCPROTOEND
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
# undef Cursor
# undef Region
#endif