- Fix build with clang

Feature safe:	yes

4 files changed, 68 insertions, 6 deletions

diff --git a/print/dviselect/files/patch-aa b/print/dviselect/files/patch-aa
index 46cd859599ff..819b8a1ca201 100644
--- a/print/dviselect/files/patch-aa
+++ b/print/dviselect/files/patch-aa
@@ -1,5 +1,5 @@
---- dviselect.c~	Wed Nov 15 13:19:15 1989
-+++ dviselect.c	Mon Jul  3 00:38:25 2000
+--- dviselect.c.orig	1989-11-15 13:19:15.000000000 +0100
++++ dviselect.c	2012-11-30 14:56:42.000000000 +0100
 @@ -122,7 +122,6 @@
  /* save some string space: we use this a lot */
  char	writeerr[] = "error writing DVI file";
@@ -8,3 +8,37 @@
  
  /*
   * lint gets rather confused with the current definitions of getc and putc,
+@@ -136,6 +135,9 @@
+ #define getc(f)   (*(f)->_ptr++)
+ #endif
+ 
++void HandleDVIFile (void);
++void EndPage (void);
++
+ /*
+  * Return true iff the 10 \counts are one of the desired output pages.
+  */
+@@ -190,6 +192,7 @@
+ /*
+  * Start a page (process a DVI_BOP).
+  */
++void
+ BeginPage()
+ {
+ 	register i32 *i;
+@@ -243,6 +246,7 @@
+ /*
+  * End a page (process a DVI_EOP).
+  */
++void
+ EndPage()
+ {
+ 	if (!ExpectEOP)
+@@ -815,6 +819,7 @@
+  * output DVI file. We also keep track of font changes, handle font
+  * definitions, and perform some other housekeeping.
+  */
++void
+ HandleDVIFile()
+ {
+ 	register int c, l;
diff --git a/print/dviselect/files/patch-lib::pkfont.c b/print/dviselect/files/patch-lib::pkfont.c
index a5f4853384d5..a3eeab64fca6 100644
--- a/print/dviselect/files/patch-lib::pkfont.c
+++ b/print/dviselect/files/patch-lib::pkfont.c
@@ -1,5 +1,14 @@
---- lib/pkfont.c.orig	Wed Nov 15 13:19:52 1989
-+++ lib/pkfont.c	Wed Dec 13 23:01:34 2006
+--- lib/pkfont.c.orig	1989-11-15 13:19:52.000000000 +0100
++++ lib/pkfont.c	2012-11-30 14:59:23.000000000 +0100
+@@ -183,7 +183,7 @@
+ /*
+  * Skip over special commands (PK_XXX?, PK_YYY).
+  */
+-static
++static void
+ skip_specials(f)
+ 	struct font *f;
+ {
 @@ -781,8 +781,8 @@
  	if (pk != NULL) {
  		free(pk->pk_base); pk -> pk_base = 0;
diff --git a/print/dviselect/files/patch-lib::rotate.c b/print/dviselect/files/patch-lib::rotate.c
new file mode 100644
index 000000000000..51af383d9d2e
--- /dev/null
+++ b/print/dviselect/files/patch-lib::rotate.c
@@ -0,0 +1,10 @@
+--- lib/rotate.c.orig	2012-11-30 14:57:39.000000000 +0100
++++ lib/rotate.c	2012-11-30 14:58:50.000000000 +0100
+@@ -31,6 +31,7 @@
+ /*
+  * Set the rotation of glyph g to r.
+  */
++void
+ SetRotation(g, r)
+ 	register struct glyph *g;
+ 	int r;
diff --git a/print/dviselect/files/patch-lib::tfmfont.c b/print/dviselect/files/patch-lib::tfmfont.c
index b4ebe64804c1..9de2cc7bce0f 100644
--- a/print/dviselect/files/patch-lib::tfmfont.c
+++ b/print/dviselect/files/patch-lib::tfmfont.c
@@ -1,5 +1,5 @@
---- lib/tfmfont.c~	Wed Nov 15 13:20:03 1989
-+++ lib/tfmfont.c	Wed Dec 13 23:04:06 2006
+--- lib/tfmfont.c.orig	1989-11-15 13:20:03.000000000 +0100
++++ lib/tfmfont.c	2012-11-30 15:00:41.000000000 +0100
 @@ -139,7 +139,7 @@
  fail:
  	(void) fclose(fd);
@@ -9,3 +9,12 @@
  	}
  	return (-1);
  }
+@@ -199,7 +199,7 @@
+ #define EDGE 2
+ 
+ 	if (tfm->tfm_edge == 0)
+-		return;
++		return (-1);
+ if (tfm->tfm_edge != 2) panic("tfm_rasterise");
+ 	for (i = l; i < h; i++) {
+ 		g = f->f_gly[i];