diff options
Diffstat (limited to 'cad/magic/patches/patch-aj')
| -rw-r--r-- | cad/magic/patches/patch-aj | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/cad/magic/patches/patch-aj b/cad/magic/patches/patch-aj index 83055fd13de..1f2dbeaf469 100644 --- a/cad/magic/patches/patch-aj +++ b/cad/magic/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-aj,v 1.2 2006/01/06 18:14:06 joerg 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 @@ +--- graphics/grMain.c.orig 2001-04-16 14:43:40.000000000 +0000 ++++ graphics/grMain.c +@@ -117,14 +117,7 @@ static char rcsid[]="$Header: /ufs/repos #ifdef SUNVIEW #include <pixrect/pixrect.h> #endif @@ -11,11 +11,14 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $ -#ifndef NO_VARARGS -#include <varargs.h> -#endif NO_VARARGS +- +-extern char *getenv(); +-extern int errno; +#endif /* sun */ - extern char *getenv(); - extern int errno; -@@ -153,21 +149,21 @@ + #define FAVORITE_DISPLAY "NULL" /* Default display type */ + +@@ -153,21 +146,21 @@ static char *grDisplayTypes[] = { "SUN110", "SUN160", "SUNBW", @@ -41,7 +44,7 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $ #ifdef X11 "XWIND", "X11", -@@ -194,25 +190,25 @@ +@@ -194,25 +187,25 @@ static (*(grInitProcs[]))() = { sunWSetDisplay, sunWSetDisplay, sunWSetDisplay, @@ -72,3 +75,11 @@ $NetBSD: patch-aj,v 1.1 2004/01/23 11:43:33 agc Exp $ #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; |