$NetBSD: patch-aj,v 1.3 2006/02/03 02:19:42 rillig Exp $

--- graphics/grMain.c.orig	2001-04-16 14:43:40.000000000 +0000
+++ graphics/grMain.c
@@ -117,14 +117,7 @@
 #ifdef SUNVIEW
 #include <pixrect/pixrect.h>
 #endif
-#endif	sun
-
-#ifndef	NO_VARARGS
-#include <varargs.h>
-#endif	NO_VARARGS
-
-extern char *getenv();
-extern int errno;
+#endif	/* sun */
 
 #define FAVORITE_DISPLAY	"NULL"	/* Default display type */
 
@@ -153,21 +146,21 @@ static char *grDisplayTypes[] = {
     "SUN110",
     "SUN160",
     "SUNBW",
-#endif	SUNVIEW
+#endif	/* SUNVIEW */
 #ifdef	SUN120
     "SUN120",
-#endif	SUN120
+#endif	/* SUN120 */
 #ifdef	AED
     "UCB512",
     "UCB512N",
     "AED767",
     "AED1024",
     "UCB1024",
-#endif	AED
+#endif	/* AED */
 #ifdef	X10
     "XWIND",
     "X10",
-#endif	X10
+#endif	/* X10 */
 #ifdef	X11
     "XWIND",
     "X11", 	
@@ -194,25 +187,25 @@ static (*(grInitProcs[]))() = {
     sunWSetDisplay,
     sunWSetDisplay,
     sunWSetDisplay,
-#endif	SUNVIEW
+#endif	/* SUNVIEW */
 #ifdef	SUN120
     sunSetDisplay,
-#endif	SUN120
+#endif	/* SUN120 */
 #ifdef	AED
     aedSetDisplay,	/* Handles all AEDs (UCB512s, AED767s, and AED1024s) */
     aedSetDisplay,
     aedSetDisplay,
     aedSetDisplay,
     aedSetDisplay,
-#endif	AED
+#endif	/* AED */
 #ifdef	X10
     x10aSetDisplay,  
     x10aSetDisplay,  
-#endif	X10
+#endif	/* X10 */
 #ifdef	X11
     x11suSetDisplay,  
     x11suSetDisplay,  
-#endif	X11
+#endif	/* X11 */
 #ifdef  OGL
     oglSetDisplay,
     oglSetDisplay,
@@ -581,7 +574,6 @@ grFgets(str, n, stream, name)
     fd_set fn;
     char *newstr;
     struct timeval threeSec, twentySecs;
-    extern int errno;
 
     threeSec.tv_sec = 3;	
     threeSec.tv_usec = 0;