diff --git a/ChangeLog b/ChangeLog index 5d54d2049..91f3e5671 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-03 Holger Vogt + * x11.c, graph.h: move #define NUMCOLORS to x11.c to avoid redefinition + under MS Visual Studion + 2011-05-01 Robert Larice * src/frontend/outitf.c , * src/spicelib/analysis/cktpzstr.c , diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c index 7e083f2a7..00937acee 100644 --- a/src/frontend/plotting/x11.c +++ b/src/frontend/plotting/x11.c @@ -57,6 +57,8 @@ $Id$ #define NXPLANES 5 /* note: What is this used for? */ #define BOXSIZE 30 /* initial size of bounding box for zoomin */ +#define NUMCOLORS 20 + typedef struct x11info { Window window; int isopen; diff --git a/src/include/graph.h b/src/include/graph.h index 311eb3449..249675936 100644 --- a/src/include/graph.h +++ b/src/include/graph.h @@ -20,8 +20,6 @@ struct _keyed; /* Device-independent data structure for plots. */ -#define NUMCOLORS 20 - struct graph { int graphid; struct dveclist *plotdata; /* normalized data */