$NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $

--- graphics/grMain.c	2004/01/23 10:00:55	1.1
+++ graphics/grMain.c	2004/01/23 10:02:35
@@ -117,11 +117,7 @@
 #ifdef SUNVIEW
 #include <pixrect/pixrect.h>
 #endif
-#endif	sun
-
-#ifndef	NO_VARARGS
-#include <varargs.h>
-#endif	NO_VARARGS
+#endif	/* sun */
 
 extern char *getenv();
 extern int errno;
@@ -153,21 +149,21 @@
     "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 +190,25 @@
     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,