Make this compile when using gcc 3.3.

2 files changed, 114 insertions, 1 deletions

diff --git a/sysutils/pcvt-utils/distinfo b/sysutils/pcvt-utils/distinfo
index 7f7e5442c82..387d0d3768b 100644
--- a/sysutils/pcvt-utils/distinfo
+++ b/sysutils/pcvt-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/05/11 20:25:05 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/05/23 22:47:53 kristerw Exp $
 
 SHA1 (netbsd-pcvt-20000611.tar.gz) = ea51ded62dc82635f1eda3cd198b29cf6f4941ea
 Size (netbsd-pcvt-20000611.tar.gz) = 315263 bytes
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = c6158765ff8ecc26dd9c297089c90b03c98172cb
 SHA1 (patch-ae) = d81e7ee5f59bf5d4e23d8f19868e190e2a8b2a53
 SHA1 (patch-af) = d07766a5d93ae97905ff0e9083246c1ad874219a
 SHA1 (patch-ag) = fe39a7224c9ea78d97750a90e110d805d353c0ad
+SHA1 (patch-ah) = fcd676c9c3e292de8dfedb37d2d10a020f5b839b
diff --git a/sysutils/pcvt-utils/patches/patch-ah b/sysutils/pcvt-utils/patches/patch-ah
new file mode 100644
index 00000000000..5ff2de5fa73
--- /dev/null
+++ b/sysutils/pcvt-utils/patches/patch-ah
@@ -0,0 +1,112 @@
+$NetBSD: patch-ah,v 1.1 2004/05/23 22:47:54 kristerw Exp $
+
+--- fontedit/fontedit.c.orig	2004-05-24 00:36:58.000000000 +0200
++++ fontedit/fontedit.c	2004-05-24 00:39:38.000000000 +0200
+@@ -26,10 +26,10 @@
+ #include <stdio.h>
+ #ifdef SYSV
+ #include <sys/termio.h>
+-#endif SYSV
++#endif /* SYSV */
+ #ifdef BSD
+ #include <sys/ioctl.h>
+-#endif BSD
++#endif /* BSD */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+ #include <sys/termios.h>
+ #include <sys/ioctl.h>
+@@ -39,7 +39,7 @@
+ #ifdef CURFIX
+ #define CURSORON  "\033[?25h"
+ #define CURSOROFF "\033[?25l"
+-#endif CURFIX
++#endif /* CURFIX */
+ 
+ #define	MAX_ROWS	10
+ #define	MAX_COLS	8
+@@ -103,10 +103,10 @@
+ 
+ #ifdef SYSV
+ struct termio old_stty, new_stty;
+-#endif SYSV
++#endif /* SYSV */
+ #ifdef BSD
+ struct sgttyb old_stty, new_stty;
+-#endif BSD
++#endif /* BSD */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+ struct termios old_stty, new_stty;
+ #endif /* __NetBSD__ || __FreeBSD__ */
+@@ -123,13 +123,13 @@
+ 	void clear_screen();
+ #ifdef CURFIX
+         printf("%s\n",CURSORON);   
+-#endif CURFIX   
++#endif /* CURFIX */
+ #ifdef SYSV
+ 	ioctl( 0, TCSETA, &old_stty );
+-#endif SYSV
++#endif /* SYSV */
+ #ifdef BSD
+         ioctl( 0, TIOCSETP, &old_stty );
+-#endif BSD
++#endif /* BSD */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+         ioctl( 0, TIOCSETA, &old_stty );
+ #endif /* __NetBSD__ || __FreeBSD__ */
+@@ -180,13 +180,13 @@
+ 	}
+ #ifdef CURFIX
+         printf("%s\n",CURSOROFF);
+-#endif CURFIX
++#endif /* CURFIX */
+ #ifdef SYSV
+ 	ioctl( 0, TCGETA, &old_stty );
+-#endif SYSV
++#endif /* SYSV */
+ #ifdef BSD
+         ioctl( 0, TIOCGETP, &old_stty );
+-#endif BSD
++#endif /* BSD */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+         ioctl( 0, TIOCGETA, &old_stty );
+ #endif /* __NetBSD__ || __FreeBSD__ */
+@@ -196,7 +196,7 @@
+ 	new_stty.c_lflag &= ~ICANON;
+ 	new_stty.c_cc[VMIN] = 1;
+ 	ioctl( 0, TCSETA, &new_stty );
+-#endif SYSV
++#endif /* SYSV */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+ 	new_stty.c_lflag &= ~ICANON;
+         new_stty.c_lflag &= ~ECHO;
+@@ -207,17 +207,17 @@
+ 	new_stty.sg_flags |= CBREAK;               
+         new_stty.sg_flags &= ~ECHO;
+ 	ioctl( 0, TIOCSETP, &new_stty );
+-#endif BSD
++#endif /* BSD */
+ 	current_entry = 1;
+ 	extract_entry( current_entry );
+ 	init_restore();
+ 	command();
+ #ifdef SYSV
+ 	ioctl( 0, TCSETA, &old_stty );
+-#endif SYSV
++#endif /* SYSV */
+ #ifdef BSD
+ 	ioctl( 0, TIOCSETP, &old_stty );
+-#endif BSD
++#endif /* BSD */
+ #if defined (__NetBSD__) || defined (__FreeBSD__)
+ 	ioctl( 0, TIOCSETA, &old_stty );
+ #endif /* __NetBSD__ || __FreeBSD__ */
+@@ -230,7 +230,7 @@
+ 	fclose( font_file );
+ #ifdef CURFIX
+         printf("%s\n",CURSORON);
+-#endif CURFIX
++#endif /* CURFIX */
+ }
+ 
+