change signature of all X11 functions to match those of CYGWIN

2 files changed, 34 insertions, 17 deletions

diff --git a/xlib/xdraw.c b/xlib/xdraw.c
index 281a7e8..6c405ad 100644
--- a/xlib/xdraw.c
+++ b/xlib/xdraw.c
@@ -28,7 +28,7 @@
  *----------------------------------------------------------------------
  */
 
-void
+int
 XDrawLine(display, d, gc, x1, y1, x2, y2)
     Display* display;
     Drawable d;
@@ -42,6 +42,7 @@ XDrawLine(display, d, gc, x1, y1, x2, y2)
     points[1].x = x2;
     points[1].y = y2;
     XDrawLines(display, d, gc, points, 2, CoordModeOrigin);
+    return 0;
 }
 
 /*
@@ -61,7 +62,7 @@ XDrawLine(display, d, gc, x1, y1, x2, y2)
  *----------------------------------------------------------------------
  */
 
-void
+int
 XFillRectangle(display, d, gc, x, y, width, height)
     Display* display;
     Drawable d;
@@ -77,4 +78,5 @@ XFillRectangle(display, d, gc, x, y, width, height)
     rectangle.width = width;
     rectangle.height = height;
     XFillRectangles(display, d, gc, &rectangle, 1);
+    return 0;
 }
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 76828b1..b0a1894 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -181,7 +181,7 @@ XCreateGC(display, d, mask, values)
  *----------------------------------------------------------------------
  */
 
-void
+int
 XChangeGC(d, gc, mask, values)
     Display * d;
     GC gc;
@@ -211,6 +211,7 @@ XChangeGC(d, gc, mask, values)
     if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); }
     if (mask & GCDashOffset) { gc->dash_offset = values->dash_offset; }
     if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0;}
+    return 0;
 }
 
 /*
@@ -229,7 +230,7 @@ XChangeGC(d, gc, mask, values)
  *----------------------------------------------------------------------
  */
 
-void XFreeGC(d, gc)
+int XFreeGC(d, gc)
     Display * d;
     GC gc;
 {
@@ -237,6 +238,7 @@ void XFreeGC(d, gc)
 	FreeClipMask(gc);
 	ckfree((char *) gc);
     }
+    return 0;
 }
 
 /*
@@ -256,25 +258,27 @@ void XFreeGC(d, gc)
  *----------------------------------------------------------------------
  */
 
-void 
+int
 XSetForeground(display, gc, foreground)
     Display *display;
     GC gc;
     unsigned long foreground;
 {
     gc->foreground = foreground;
+    return 0;
 }
 
-void 
+int
 XSetBackground(display, gc, background)
     Display *display;
     GC gc;
     unsigned long background;
 {
     gc->background = background;
+    return 0;
 }
 
-void
+int
 XSetDashes(display, gc, dash_offset, dash_list, n)
     Display* display;
     GC gc;
@@ -296,36 +300,40 @@ XSetDashes(display, gc, dash_offset, dash_list, n)
 	*p++ = *dash_list++;
     }
     *p = 0;
+    return 0;
 }
 
-void
+int
 XSetFunction(display, gc, function)
     Display *display;
     GC gc;
     int function;
 {
     gc->function = function;
+    return 0;
 }
 
-void
+int
 XSetFillRule(display, gc, fill_rule)
     Display *display;
     GC gc;
     int fill_rule;
 {
     gc->fill_rule = fill_rule;
+    return 0;
 }
 
-void
+int
 XSetFillStyle(display, gc, fill_style)
     Display *display;
     GC gc;
     int fill_style;
 {
     gc->fill_style = fill_style;
+    return 0;
 }
 
-void
+int
 XSetTSOrigin(display, gc, x, y)
     Display *display;
     GC gc;
@@ -333,36 +341,40 @@ XSetTSOrigin(display, gc, x, y)
 {
     gc->ts_x_origin = x;
     gc->ts_y_origin = y;
+    return 0;
 }
 
-void
+int
 XSetFont(display, gc, font)
     Display *display;
     GC gc;
     Font font;
 {
     gc->font = font;
+    return 0;
 }
 
-void
+int
 XSetArcMode(display, gc, arc_mode)
     Display *display;
     GC gc;
     int arc_mode;
 {
     gc->arc_mode = arc_mode;
+    return 0;
 }
 
-void
+int
 XSetStipple(display, gc, stipple)
     Display *display;
     GC gc;
     Pixmap stipple;
 {
     gc->stipple = stipple;
+    return 0;
 }
 
-void
+int
 XSetLineAttributes(display, gc, line_width, line_style, cap_style,
 	join_style)
     Display *display;
@@ -376,9 +388,10 @@ XSetLineAttributes(display, gc, line_width, line_style, cap_style,
     gc->line_style = line_style;
     gc->cap_style = cap_style;
     gc->join_style = join_style;
+    return 0;
 }
 
-void
+int
 XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
     Display* display;
     GC gc;
@@ -387,6 +400,7 @@ XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
 {
     gc->clip_x_origin = clip_x_origin;
     gc->clip_y_origin = clip_y_origin;
+    return 0;
 }
 
 /*
@@ -429,7 +443,7 @@ TkSetRegion(display, gc, r)
     }
 }
 
-void
+int
 XSetClipMask(display, gc, pixmap)
     Display* display;
     GC gc;
@@ -443,6 +457,7 @@ XSetClipMask(display, gc, pixmap)
 	clip_mask->type = TKP_CLIP_PIXMAP;
 	clip_mask->value.pixmap = pixmap;
     }
+    return 0;
 }
 
 /*