Fix build with newer GCC


(joerg)

$NetBSD: patch-image.h,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- image.h.orig	1998-03-10 07:33:31.000000000 +0000
+++ image.h
@@ -1,6 +1,8 @@
 #ifndef __IMAGE_H__
 #define __IMAGE_H__
 
+#include <X11/Xlib.h>
+
 /* +-------------------------------------------------------------------+ */
 /* | Copyright (C) 1993, David Koblas (koblas@netcom.com)              | */
 /* | Copyright 1995, 1996 Torsten Martinsen (bullestock@dk-online.dk)  | */
@@ -64,7 +66,6 @@ typedef struct {
     unsigned long sourceMask;
 } Image;
 
-#ifdef _XLIB_H_
 /* Used to transfer information to routines in iprocess.c */
 struct imageprocessinfo {
     int oilArea;
@@ -86,8 +87,6 @@ struct imageprocessinfo {
     XColor *background;
 };
 
-#endif
-
 #define ImagePixel(image, x, y)						\
 	(((image)->cmapSize == 0)					\
 	  ? &((image)->data[((y) * (image)->width + (x)) * 3])		\

$NetBSD: patch-main.c,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- main.c.orig	1998-04-16 01:17:10.000000000 +0000
+++ main.c
@@ -18,6 +18,7 @@
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
 #include <X11/StringDefs.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
@@ -47,7 +48,7 @@ static char *appDefaults[] =
     NULL
 };
 
-gcFunction = 3;
+int gcFunction = 3;
 
 typedef struct {
     String visualType;
@@ -272,7 +273,7 @@ GetFutureVisual(Widget *toplevel, int de
 }
 
 
-void 
+int
 main(int argc, char *argv[])
 {
     Display *dpy;

$NetBSD: patch-protocol.c,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- protocol.c.orig	2011-12-05 20:27:50.000000000 +0000
+++ protocol.c
@@ -21,6 +21,7 @@
 #include <X11/cursorfont.h>
 #include <sys/time.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "xpaint.h"
 #include "misc.h"

$NetBSD: patch-rw_readGIF.c,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- rw/readGIF.c.orig	2011-12-05 20:25:31.000000000 +0000
+++ rw/readGIF.c
@@ -43,7 +43,7 @@ struct {
     unsigned int ColorResolution;
     unsigned int Background;
     unsigned int AspectRatio;
-    int GrayScale;
+    int GrayScale2;
 } GifScreen;
 
 static struct {
@@ -137,7 +137,7 @@ ReadGIF(char *file)
 
     if (BitSet(buf[4], LOCALCOLORMAP)) {	/* Global Colormap */
 	if (ReadColorMap(fd, GifScreen.BitPixel, GifScreen.ColorMap,
-			 &GifScreen.GrayScale)) {
+			 &GifScreen.GrayScale2)) {
 	    RWSetMsg("error reading global colormap");
 	    fclose(fd);
 	    return image;
@@ -193,7 +193,7 @@ ReadGIF(char *file)
 	    image = ReadImage(fd, LM_to_uint(buf[4], buf[5]),
 			      LM_to_uint(buf[6], buf[7]),
 			      GifScreen.BitPixel, GifScreen.ColorMap,
-			      GifScreen.GrayScale, BitSet(buf[8], INTERLACE),
+			      GifScreen.GrayScale2, BitSet(buf[8], INTERLACE),
 			      imageCount != imageNumber);
 	}
     }

$NetBSD: patch-rw_readWriteXBM.c,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- rw/readWriteXBM.c.orig	2011-12-05 20:26:00.000000000 +0000
+++ rw/readWriteXBM.c
@@ -16,8 +16,7 @@
 
 #include <stdio.h>
+#include <string.h>
 #include "image.h"
 
-int strncmp(char *, char *, int);
-
 #define TRUE 1
 #define FALSE 0
@@ -57,7 +56,4 @@ int strncmp(char *, char *, int);
 #include <ctype.h>
 
-extern char *strrchr(char *, char);
-
-
 #define MAX_SIZE 255
 #define True 1

$NetBSD: patch-rw_readWriteXWD.c,v 1.1 2011/12/05 22:48:59 joerg Exp $

--- rw/readWriteXWD.c.orig	2011-12-05 20:25:22.000000000 +0000
+++ rw/readWriteXWD.c
@@ -27,6 +27,7 @@
 
 #include "image.h"
 #include <stdio.h>
+#include <string.h>
 
 #include <X11/XWDFile.h>
 
@@ -59,7 +60,7 @@ void *calloc(int, int);
 #define ZPixmap		2
 
 #define StaticGray	0
-#define GrayScale	1
+#define GrayScale2	1
 #define StaticColor	2
 #define PseudoColor	3
 #define TrueColor	4
@@ -559,7 +560,7 @@ Image *
 	    scale = 256 / (1 << hdr.bits_per_pixel) - 1;
 	}
 	break;
-    default:			/* StaticColor, PseudoColor, GrayScale */
+    default:			/* StaticColor, PseudoColor, GrayScale2 */
 	if (image != NULL)
 	    break;
 	image = ImageNew(hdr.pixmap_width, hdr.pixmap_height);
@@ -586,7 +587,7 @@ Image *
     for (y = 0; y < image->height; y++) {
 	switch (hdr.visual_class) {
 	case StaticGray:
-	case GrayScale:
+	case GrayScale2:
 	case StaticColor:
 	case PseudoColor:
 	    for (x = 0; x < image->width; x++) {