1 files changed, 13 insertions, 21 deletions

diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index f0affb8..8318724 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -67,6 +67,9 @@
 #       include <time.h>
 #   endif
 #endif
+#if HAVE_INTTYPES_H
+#    include <inttypes.h>
+#endif
 #ifndef NO_UNISTD_H
 #   include <unistd.h>
 #else
@@ -126,29 +129,13 @@
 #endif
 
 /*
- * These macros are just wrappers for the equivalent X Region calls.
- */
-
-#define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect)
-#define TkCreateRegion() (TkRegion) XCreateRegion()
-#define TkDestroyRegion(rgn) XDestroyRegion((Region) rgn)
-#define TkIntersectRegion(a, b, r) XIntersectRegion((Region) a, \
-	(Region) b, (Region) r)
-#define TkRectInRegion(r, x, y, w, h) XRectInRegion((Region) r, x, y, w, h)
-#define TkSetRegion(d, gc, rgn) XSetRegion(d, gc, (Region) rgn)
-#define TkSubtractRegion(a, b, r) XSubtractRegion((Region) a, \
-	(Region) b, (Region) r)
-#define TkUnionRectWithRegion(rect, src, ret) XUnionRectWithRegion(rect, \
-	(Region) src, (Region) ret)
-
-/*
  * The TkPutImage macro strips off the color table information, which isn't
  * needed for X.
  */
 
-#define TkPutImage(colors, ncolors, display, pixels, gc, image, destx, desty, srcx, srcy, width, height) \
-	XPutImage(display, pixels, gc, image, destx, desty, srcx, \
-	srcy, width, height);
+#define TkPutImage(colors, ncolors, display, pixels, gc, image, srcx, srcy, destx, desty, width, height) \
+	XPutImage(display, pixels, gc, image, srcx, srcy, destx, \
+	desty, width, height);
 
 #ifdef __CYGWIN__
 #   define UINT unsigned int
@@ -195,7 +182,9 @@
 #define TkpButtonSetDefaults(specPtr) {}
 #define TkpDestroyButton(butPtr) {}
 #define TkSelUpdateClipboard(a,b) {}
+#ifndef __CYGWIN__
 #define TkSetPixmapColormap(p,c) {}
+#endif
 
 /*
  * These calls implement native bitmaps which are not supported under
@@ -210,17 +199,20 @@
  * This macro stores a representation of the window handle in a string.
  * This should perhaps use the real size of an XID.
  */
-
+#ifndef __CYGWIN__
 #define TkpPrintWindowId(buf,w) \
 	sprintf((buf), "%#08lx", (unsigned long) (w))
+#endif
 
 /*
  * The following declaration is used to get access to a private Tcl interface
  * that is needed for portability reasons.
- */
+ *
+ * Disabled for now to determined whether we really still need this.
 
 #ifndef _TCLINT
 #include <tclInt.h>
 #endif
+ */
 
 #endif /* _UNIXPORT */