Fix up return types for clang. Fix problem this exposed calling XFlush()

with the wrong (no) arguments.

3 files changed, 109 insertions, 1 deletions

diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index f9f3016f2a9..3d902ee8ce3 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/12/26 21:55:37 dholland Exp $
+$NetBSD: distinfo,v 1.14 2012/12/26 22:31:31 dholland Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -29,3 +29,5 @@ SHA1 (patch-at) = 34bf252c122727308ebaa47177afabbc888a4f6a
 SHA1 (patch-au) = 35660480163fb7444ebbdb1fee4ad1cebf866ef4
 SHA1 (patch-av) = 0bfd2ec0fb16f3c106a285b49f1cf48a29274fbb
 SHA1 (patch-aw) = 6b57d85e4c4ef4a3501f4a0263ef8a47fbac8958
+SHA1 (patch-src_meta_plot.h) = b6959e2d349dc25abbde816f4b128a2fb0218200
+SHA1 (patch-src_meta_xmeta.c) = 360c282bd9adf376ea86140d6c63af523114618d
diff --git a/graphics/radiance/patches/patch-src_meta_plot.h b/graphics/radiance/patches/patch-src_meta_plot.h
new file mode 100644
index 00000000000..ccfdec16584
--- /dev/null
+++ b/graphics/radiance/patches/patch-src_meta_plot.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_meta_plot.h,v 1.1 2012/12/26 22:31:31 dholland Exp $
+
+- declare own functions
+
+--- src/meta/plot.h~	2003-11-15 16:51:42.000000000 +0000
++++ src/meta/plot.h
+@@ -50,6 +50,8 @@ extern void contpage(void);
+ extern void printspan(void);
+ extern void endpage(void);
+ 
++	/* xmeta.c */
++void replay(int, int, int, int);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/graphics/radiance/patches/patch-src_meta_xmeta.c b/graphics/radiance/patches/patch-src_meta_xmeta.c
new file mode 100644
index 00000000000..ba45b012f6d
--- /dev/null
+++ b/graphics/radiance/patches/patch-src_meta_xmeta.c
@@ -0,0 +1,91 @@
+$NetBSD: patch-src_meta_xmeta.c,v 1.1 2012/12/26 22:31:31 dholland Exp $
+
+- include needed X headers
+- pass XFlush() its argument (hopefully the right one, but it's better
+  than using uninitialized stack trash)
+- declare static functions static
+- declare void functions void
+- avoid implicit int
+
+--- src/meta/xmeta.c.orig	2003-11-17 02:21:53.000000000 +0000
++++ src/meta/xmeta.c
+@@ -9,10 +9,14 @@ static const char	RCSid[] = "$Id: xmeta.
+  *     2/26/86
+  */
+ 
++#include <X11/Xlib.h>
++
+ #include  "rtprocess.h"
+ #include  "meta.h"
+ #include  "plot.h"
+ 
++/* XXX should be in a header */
++extern Display *dpy;	/* from x11plot.c */
+ 
+ #define  overlap(p,xmn,ymn,xmx,ymx)  (ov((p)->xy[XMN],(p)->xy[XMX],xmn,xmx) \
+ 				     &&ov((p)->xy[YMN],(p)->xy[YMX],ymn,ymx))
+@@ -21,6 +25,8 @@ static const char	RCSid[] = "$Id: xmeta.
+ 
+ #define  XCOM  "pexpand +OCIsv -P %s"
+ 
++static void doglobal(register PRIMITIVE *g, int sf);
++static void doprim(register PRIMITIVE *p, int sf);
+ 
+ char  *progname;
+ 
+@@ -31,7 +37,7 @@ static PLIST  recording;
+ int maxalloc = 0;		/* no limit */
+ 
+ 
+-
++int
+ main(argc, argv)
+ 
+ int  argc;
+@@ -121,7 +127,7 @@ FILE  *infp;
+ }
+ 
+ 
+-
++void
+ replay(xmin, ymin, xmax, ymax)		/* play back region */
+ int  xmin, ymin, xmax, ymax;
+ {
+@@ -140,7 +146,7 @@ int  xmin, ymin, xmax, ymax;
+ 
+ 
+ 
+-
++static void
+ save(p)				/* record primitive */
+ PRIMITIVE  *p;
+ {
+@@ -153,8 +159,7 @@ PRIMITIVE  *p;
+ }
+ 
+ 
+-
+-
++static void
+ doglobal(g, sf)			/* execute a global command */
+ 
+ register PRIMITIVE  *g;
+@@ -168,7 +173,7 @@ int  sf;
+ 	    return;
+ 
+ 	case PDRAW:
+-	    XFlush();
++	    XFlush(dpy);
+ 	    break;
+ 
+ 	case PEOP:
+@@ -201,8 +206,7 @@ int  sf;
+ }
+ 
+ 
+-
+-
++static void
+ doprim(p, sf)		/* plot primitive */
+ 
+ register PRIMITIVE  *p;