From 81fa7338d94c665148cd3ab3ef82c37edab881b8 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Fri, 22 Dec 2006 14:57:50 +0000
Subject: Renamed local X11 emulation functions to avoid name clashes with Tk

---
 generic/Types.h |  8 ++++++++
 win/WinPort.c   | 18 +++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/generic/Types.h b/generic/Types.h
index f08ca15..6d42dfc 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -139,26 +139,34 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
 #  pragma warning(disable : 4273)
 #  endif
 #undef XFillRectangle
+#define XFillRectangle ZnXFillRectangle
 void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y,
                     unsigned int width, unsigned int height);
 #  undef XFillRectangles
+#define XFillRectangles ZnXFillRectangles
 void XFillRectangles(Display *display, Drawable d, GC gc,
                      XRectangle* rectangles, int nrectangles);
 #  undef XFillArc
+#define XFillArc ZnXFillArc
 void XFillArc(Display *display, Drawable d, GC gc, int x, int y, unsigned int width,
               unsigned int height, int start, int extent);
 #  undef XFillPolygon
+#define XFillPolygon ZnXFillPolygon
 void XFillPolygon(Display *display, Drawable d, GC gc, XPoint *points, int npoints,
                   int shape, int mode);
 #  undef XDrawRectangle
+#define XDrawRectangle ZnXDrawRectangle
 void XDrawRectangle(Display *display, Drawable d, GC gc, int x, int y,
                     unsigned int width, unsigned int height);
 #  undef XDrawArc
+#define XDrawArc ZnXDrawArc
 void XDrawArc(Display *display, Drawable d, GC gc, int x, int y,
               unsigned int width, unsigned int height, int start, int extent);
 #  undef XDrawLine
+#define XDrawLine ZnXDrawLine
 void XDrawLine(Display *display, Drawable d, GC gc, int x1, int y1, int x2, int y2);
 #  undef XDrawLines
+#define XDrawLines ZnXDrawLines
 void XDrawLines(Display *display, Drawable d, GC gc, XPoint* points,
                 int npoints, int mode);
 
diff --git a/win/WinPort.c b/win/WinPort.c
index 812165a..0a5df7f 100644
--- a/win/WinPort.c
+++ b/win/WinPort.c
@@ -151,7 +151,7 @@ ZnPolygonRegion(XPoint	*points,
  * Translation table between X gc functions and Win32 raster op modes.
  */
 
-int tkpWinRopModes[] = {
+static int tkpWinRopModes[] = {
     R2_BLACK,			/* GXclear */
     R2_MASKPEN,			/* GXand */
     R2_MASKPENNOT,		/* GXandReverse */
@@ -365,7 +365,7 @@ ConvertPoints(points, npoints, mode, bbox)
  *----------------------------------------------------------------------
  */
 void
-XFillRectangles(display, d, gc, rectangles, nrectangles)
+ZnXFillRectangles(display, d, gc, rectangles, nrectangles)
     Display* display;
     Drawable d;
     GC gc;
@@ -472,7 +472,7 @@ XFillRectangles(display, d, gc, rectangles, nrectangles)
  */
 
 void
-XFillRectangle(display, d, gc, x, y, width, height)
+ZnXFillRectangle(display, d, gc, x, y, width, height)
     Display* display;
     Drawable d;
     GC gc;
@@ -642,7 +642,7 @@ RenderObject(dc, gc, points, npoints, mode, pen, func)
  */
 
 void
-XDrawLines(display, d, gc, points, npoints, mode)
+ZnXDrawLines(display, d, gc, points, npoints, mode)
     Display* display;
     Drawable d;
     GC gc;
@@ -690,7 +690,7 @@ XDrawLines(display, d, gc, points, npoints, mode)
  */
 
 void
-XDrawLine(display, d, gc, x1, y1, x2, y2)
+ZnXDrawLine(display, d, gc, x1, y1, x2, y2)
     Display* display;
     Drawable d;
     GC gc;
@@ -722,7 +722,7 @@ XDrawLine(display, d, gc, x1, y1, x2, y2)
  */
 
 void
-XFillPolygon(display, d, gc, points, npoints, shape, mode)
+ZnXFillPolygon(display, d, gc, points, npoints, shape, mode)
     Display* display;
     Drawable d;
     GC gc;
@@ -764,7 +764,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode)
  */
 
 void
-XDrawRectangle(display, d, gc, x, y, width, height)
+ZnXDrawRectangle(display, d, gc, x, y, width, height)
     Display* display;
     Drawable d;
     GC gc;
@@ -979,7 +979,7 @@ DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill)
  */
 
 void
-XDrawArc(display, d, gc, x, y, width, height, start, extent)
+ZnXDrawArc(display, d, gc, x, y, width, height, start, extent)
     Display* display;
     Drawable d;
     GC gc;
@@ -1012,7 +1012,7 @@ XDrawArc(display, d, gc, x, y, width, height, start, extent)
  */
 
 void
-XFillArc(display, d, gc, x, y, width, height, start, extent)
+ZnXFillArc(display, d, gc, x, y, width, height, start, extent)
     Display* display;
     Drawable d;
     GC gc;
-- 
cgit v1.1