diff -u -N -r Xev111-orig/Image/cED.c Xev111/Image/cED.c --- Xev111-orig/Image/cED.c Thu Feb 27 04:52:41 1997 +++ Xev111/Image/cED.c Sun Nov 7 22:02:26 1999 @@ -2,6 +2,7 @@ #include #include +#define _MAIN #include "../colorlist.h" #define CSIZE 32 diff -u -N -r Xev111-orig/back.h Xev111/back.h --- Xev111-orig/back.h Fri Oct 25 07:47:51 1996 +++ Xev111/back.h Sat Nov 6 14:27:59 1999 @@ -1,3 +1,6 @@ +#ifndef __BACK_H +#define __BACK_H + #define CHIJOU 219 PRIVATE char *fn[] = { @@ -222,9 +225,5 @@ "nasM3.img" }; - - - - - +#endif diff -u -N -r Xev111-orig/colorlist.h Xev111/colorlist.h --- Xev111-orig/colorlist.h Thu Sep 26 22:34:55 1996 +++ Xev111/colorlist.h Sat Nov 6 03:21:46 1999 @@ -1,6 +1,10 @@ +#ifndef __COLORLIST_H +#define __COLORLIST_H + #define COLORNUM 42 -static unsigned short rgb[COLORNUM][3] = { +#ifdef _MAIN +unsigned short rgb[COLORNUM][3] = { {0,0,0}, /*1*/ {16,16,16}, {32,32,32}, @@ -44,9 +48,9 @@ {255,200,0}, {200,0,0} }; - - - - +#else +extern unsigned short rgb[COLORNUM][3]; +#endif +#endif