[patch] patch-2.6.diff (put in files subdirectory)

patch-2.6.diff (text/plain), 2.48 KB, created by Tim Cera on 2006-03-22 19:16:55 UTC

diff -ur xgks-2.6/src/lib/c/gerhnd.fc xgks-2.6.new/src/lib/c/gerhnd.fc
--- xgks-2.6/src/lib/c/gerhnd.fc	2000-08-01 12:38:00.000000000 -0400
+++ xgks-2.6/src/lib/c/gerhnd.fc	2006-03-22 21:08:29.000000000 -0500
@@ -41,7 +41,7 @@
 #include "xgks.h"
 #include "../fortran/fortxgks.h"
 
-FILE	*errfp			= stderr;	/* error file */
+FILE	*errfp			= NULL;	/* error file */
 
 
 /*
diff -ur xgks-2.6/src/lib/c/open_gks.c xgks-2.6.new/src/lib/c/open_gks.c
--- xgks-2.6/src/lib/c/open_gks.c	1993-03-10 14:44:12.000000000 -0500
+++ xgks-2.6/src/lib/c/open_gks.c	2006-03-22 21:10:11.000000000 -0500
@@ -40,6 +40,7 @@
 /* LINTLIBRARY */
 
 #include "udposix.h"
+#include <stdio.h>
 #include "gks_implem.h"
 #include "fillarea.h"
 #include "text.h"
@@ -93,6 +94,8 @@
      * Set FORTRAN error file.
      */
     errfp	= err_file;
+    if (errfp == NULL)
+	    errfp = stderr;
 
     return 0;
 }
diff -ur xgks-2.6/src/lib/c/x/xcolours.c xgks-2.6.new/src/lib/c/x/xcolours.c
--- xgks-2.6/src/lib/c/x/xcolours.c	2000-08-01 12:38:25.000000000 -0400
+++ xgks-2.6/src/lib/c/x/xcolours.c	2006-03-22 21:36:29.000000000 -0500
@@ -229,11 +229,10 @@
     unsigned long   pixel;		/* X pixel value (in) */
 {
     assert(map != NULL);
-    assert(pixel < map->length);
     assert(index >= 0 && index < map->length);
 
     map->Xpixels[index] = pixel;
-    map->GKSindexes[pixel] = index;
+    map->GKSindexes[index] = index;
 }
 
 
@@ -520,9 +519,9 @@
 	    ws->vinfo = vinfo;
 	    ws->screenNum = screenNum;
 	    XcMap_enter(
-		ws->XcMap, GKS_BACKGROUND_INDEX, BlackPixel(dpy, screenNum));
+		&(ws->XcMap), GKS_BACKGROUND_INDEX, BlackPixel(dpy, screenNum));
 	    XcMap_enter(
-		ws->XcMap, GKS_FOREGROUND_INDEX, WhitePixel(dpy, screenNum));
+		&(ws->XcMap), GKS_FOREGROUND_INDEX, WhitePixel(dpy, screenNum));
 	    status = 1;		/* success */
 	}
     }
diff -ur xgks-2.6/src/port/fortc/Makefile.in xgks-2.6.new/src/port/fortc/Makefile.in
--- xgks-2.6/src/port/fortc/Makefile.in	2000-08-07 18:04:42.000000000 -0400
+++ xgks-2.6/src/port/fortc/Makefile.in	2006-03-22 21:07:07.000000000 -0500
@@ -15,6 +15,7 @@
 		  domainos.m4 \
 		  hpux.m4 \
 		  irix.m4 \
+		  linux.m4 \
 		  msoft.m4 \
 		  next-absoft.m4 \
 		  osf.m4 \
diff -ur xgks-2.6/src/port/misc/signal.h.in xgks-2.6.new/src/port/misc/signal.h.in
--- xgks-2.6/src/port/misc/signal.h.in	2000-08-07 18:04:39.000000000 -0400
+++ xgks-2.6/src/port/misc/signal.h.in	2006-03-22 21:15:18.000000000 -0500
@@ -47,7 +47,7 @@
 	void		(*sa_handler)();
 	sigset_t	sa_mask;
 	int		sa_flags;
-    }
+    };
 #endif