From a8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 10 May 2004 15:38:58 +0000
Subject: Changes to remove Windows warnings.

---
 generic/Types.h | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

(limited to 'generic')

diff --git a/generic/Types.h b/generic/Types.h
index 8489d2c..1a9b7bc 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -73,9 +73,9 @@
 /* This EXTERN declaration is needed for Tcl < 8.0.3 */
 #ifndef EXTERN
 # ifdef __cplusplus
-#  define EXTERN extern "C"
+#  define EXTERN extern "C" TCL_STORAGE_CLASS
 # else
-#  define EXTERN extern
+#  define EXTERN extern TCL_STORAGE_CLASS
 # endif
 #endif
 
@@ -137,41 +137,20 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
 #  endif
 
 #  undef XFillRectangle
-EXTERN void XFillRectangle(Display* display, Drawable d, GC gc,
-			   int x, int y, unsigned int width,
-			   unsigned int height);
 #  undef XFillRectangles
-EXTERN void XFillRectangles(Display*display, Drawable d, GC gc,
-			    XRectangle *rectangles, int nrectangles);
 #  undef XFillArc
-EXTERN void XFillArc(Display* display, Drawable d, GC gc,
-		     int x, int y, unsigned int width,
-		     unsigned int height, int start, int extent);
 #  undef XFillPolygon
-EXTERN void XFillPolygon(Display* display, Drawable d, GC gc,
-			 XPoint* points, int npoints, int shape,
-			 int mode);
 #  undef XDrawRectangle
-EXTERN void XDrawRectangle(Display* display, Drawable d, GC gc,
-			   int x, int y, unsigned int width,
-			   unsigned int height);
 #  undef XDrawArc
-EXTERN void XDrawArc(Display* display, Drawable d, GC gc,
-		     int x, int y, unsigned int width,
-		     unsigned int height, int start, int extent);
 #  undef XDrawLine
-EXTERN void XDrawLine(Display* display, Drawable d, GC gc,
-		      int x1, int y1, int x2, int y2);
 #  undef XDrawLines
-EXTERN void XDrawLines(Display* display, Drawable d, GC gc,
-		       XPoint* points, int npoints, int mode);
-
-EXTERN ZnBool ZnPointInRegion(TkRegion reg, int x, int y);
-EXTERN void ZnUnionRegion(TkRegion sra, TkRegion srb, 
-			  TkRegion dr_return);
-EXTERN void ZnOffsetRegion(TkRegion reg, int dx, int dy);
-EXTERN TkRegion ZnPolygonRegion(XPoint *points, int n,
-				int fill_rule);
+
+ZnBool ZnPointInRegion(TkRegion reg, int x, int y);
+void ZnUnionRegion(TkRegion sra, TkRegion srb, 
+		   TkRegion dr_return);
+void ZnOffsetRegion(TkRegion reg, int dx, int dy);
+TkRegion ZnPolygonRegion(XPoint *points, int n,
+			 int fill_rule);
 #  ifdef GL
 #    define ZnGLContext HGLRC
 #    define ZnGLWaitX()
-- 
cgit v1.1