Update of /cvsroot/netrek/server/Vanilla/xsg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/xsg
Modified Files:
defaults.c input.c main.c modify.c robotwin.c shmem.c
x11window.c
Log Message:
Index: main.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c 21 Mar 2005 05:23:48 -0000 1.1
+++ main.c 22 Apr 2006 02:16:47 -0000 1.2
@@ -4,6 +4,7 @@
#include "copyright.h"
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/input.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input.c 21 Mar 2005 05:23:48 -0000 1.1
+++ input.c 22 Apr 2006 02:16:47 -0000 1.2
@@ -6,6 +6,7 @@
#include "copyright.h"
#include <stdio.h>
+#include <stdlib.h>
#include <math.h>
#include <sys/types.h>
#include <signal.h>
Index: robotwin.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/robotwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- robotwin.c 21 Mar 2005 05:23:48 -0000 1.1
+++ robotwin.c 22 Apr 2006 02:16:47 -0000 1.2
@@ -4,6 +4,7 @@
#include "copyright.h"
#include <stdio.h>
+#include <unistd.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/wait.h>
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/defaults.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defaults.c 30 Sep 2005 05:52:13 -0000 1.2
+++ defaults.c 22 Apr 2006 02:16:47 -0000 1.3
@@ -4,6 +4,7 @@
*/
#include "copyright2.h"
#include <stdio.h>
+#include <string.h>
struct stringlist {
char *string;
@@ -14,7 +15,6 @@
struct stringlist *defaults=NULL;
char *getenv();
-char *strdup();
initDefaults(deffile)
char *deffile; /* As opposed to defile? */
@@ -61,16 +61,6 @@
fclose(fp);
}
-char *strdup(str)
-const char *str;
-{
- char *s;
-
- s=(char *) malloc(strlen(str)+1);
- strcpy(s,str);
- return(s);
-}
-
char *getdefault(str)
char *str;
{
Index: modify.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/modify.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- modify.c 21 Mar 2005 05:23:48 -0000 1.1
+++ modify.c 22 Apr 2006 02:16:47 -0000 1.2
@@ -36,7 +36,7 @@
"Ship class: Galaxy (GA)",
#endif
#ifdef ATT
- "Ship class: AT&T (??)",
+ "Ship class: AT&T",
#endif
""};
Index: x11window.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/x11window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- x11window.c 30 Sep 2005 05:46:19 -0000 1.2
+++ x11window.c 22 Apr 2006 02:16:47 -0000 1.3
@@ -316,17 +316,17 @@
}
if (i==W_Red) {
colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
- W_Root, striped, TILESIDE, TILESIDE,
+ W_Root, (char *) striped, TILESIDE, TILESIDE,
white, black,
DefaultDepth(W_Display, W_Screen));
} else if (i==W_Yellow) {
colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
- W_Root, gray, TILESIDE, TILESIDE,
+ W_Root, (char *) gray, TILESIDE, TILESIDE,
white, black,
DefaultDepth(W_Display, W_Screen));
} else {
colortable[i].pixmap=XCreatePixmapFromBitmapData(W_Display,
- W_Root, solid, TILESIDE, TILESIDE,
+ W_Root, (char *) solid, TILESIDE, TILESIDE,
colortable[i].pixelValue,
colortable[i].pixelValue,
DefaultDepth(W_Display, W_Screen));
@@ -353,7 +353,7 @@
XAllocColor(W_Display, W_Colormap, &foo);
colortable[i].pixelValue = foo.pixel;
colortable[i].pixmap = XCreatePixmapFromBitmapData(W_Display,
- W_Root, solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
+ W_Root, (char *) solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
DefaultDepth(W_Display, W_Screen));
}
} else {
@@ -415,7 +415,7 @@
XStoreColor(W_Display, W_Colormap, &foo);
colortable[i].pixelValue = foo.pixel;
colortable[i].pixmap = XCreatePixmapFromBitmapData(W_Display,
- W_Root, solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
+ W_Root, (char *) solid, TILESIDE, TILESIDE, foo.pixel, foo.pixel,
DefaultDepth(W_Display, W_Screen));
}
}
Index: shmem.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/xsg/shmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shmem.c 21 Mar 2005 05:23:48 -0000 1.1
+++ shmem.c 22 Apr 2006 02:16:47 -0000 1.2
@@ -4,6 +4,7 @@
#include "copyright.h"
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>