rename color_t -> gvcolor_t to avoid conflict with ocaml

diff --git a/lib/common/color.h b/lib/common/color.h
index d69b5f069f56f4ff56256aef35200a32d6b69eb9..161f137e1a6e81a44ae1a33546bebee1c12bf3d7 100644 (file)
--- a/lib/common/color.h
+++ b/lib/common/color.h
@@ -28,11 +28,11 @@ typedef struct hsbcolor_t {
     unsigned char h, s, b;
 } hsbcolor_t;
 
-/* possible representations of color in color_t */
+/* possible representations of color in gvcolor_t */
 typedef enum { HSV_DOUBLE, RGBA_BYTE, RGBA_WORD, CMYK_BYTE,
                RGBA_DOUBLE, COLOR_STRING, COLOR_INDEX } color_type_t;
 
-/* color_t can hold a color spec in a choice or representations */
+/* gvcolor_t can hold a color spec in a choice or representations */
 typedef struct color_s {
     union {
        double RGBA[4];
@@ -44,7 +44,7 @@ typedef struct color_s {
        int index;
     } u;
     color_type_t type;
-} color_t;
+} gvcolor_t;
 
 #define COLOR_MALLOC_FAIL -1
 #define COLOR_UNKNOWN 1

diff --git a/lib/common/colorprocs.h b/lib/common/colorprocs.h
index bd7514689308ea94ad141c8191a56e17a49237fc..68f9f163dd699cc3ba7558193471b01d7526e486 100644 (file)
--- a/lib/common/colorprocs.h
+++ b/lib/common/colorprocs.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-extern int colorxlate(char *str, color_t * color, color_type_t target_type);
+extern int colorxlate(char *str, gvcolor_t * color, color_type_t target_type);
 extern char *canontoken(char *str);
 
 #ifdef __cplusplus

diff --git a/lib/common/colxlate.c b/lib/common/colxlate.c
index 266f9ed4ad1265bde9d9f027a10a10d68c8e4122..d08b9a990fa5d0be39d908908392647186b5a0c8 100644 (file)
--- a/lib/common/colxlate.c
+++ b/lib/common/colxlate.c
@@ -159,7 +159,7 @@ char *canontoken(char *str)
     return (char*)canon;
 }
 
-int colorxlate(char *str, color_t * color, color_type_t target_type)
+int colorxlate(char *str, gvcolor_t * color, color_type_t target_type)
 {
     static hsbcolor_t *last;
     static unsigned char *canon;

diff --git a/lib/common/figgen.c b/lib/common/figgen.c
index 2a2676b30f1993285deab5b284c8b716b9507e6c..b6087753cb1310d99db3b2adbf8cca6fcd12c9e1 100644 (file)
--- a/lib/common/figgen.c
+++ b/lib/common/figgen.c
@@ -269,7 +269,7 @@ static unsigned char fig_resolve_color(char *name)
     unsigned char i;
     int new;
     char *tok;
-    color_t color;
+    gvcolor_t color;
 
     static char *figcolor[] = { "black", "blue", "green", "cyan",
        "red", "magenta", "yellow", "white", (char *) NULL

diff --git a/lib/common/gdgen.c b/lib/common/gdgen.c
index b1cb605a5688e7676dda376a3f79f24ac98fb2e6..2d1b292e39ca09daa12501025710796f37a0830c 100644 (file)
--- a/lib/common/gdgen.c
+++ b/lib/common/gdgen.c
@@ -87,7 +87,7 @@ static int white, black, transparent;
 
 static int gd_resolve_color(char *name)
 {
-    color_t color;
+    gvcolor_t color;
 
     if (!(strcmp(name, "transparent"))) {
        /* special case for "transparent" color */

diff --git a/lib/common/hpglgen.c b/lib/common/hpglgen.c
index 5fdca4724543810fe07bfdd41048ca379704d048..ff7971065458d958aca660382de1cce936481811 100644 (file)
--- a/lib/common/hpglgen.c
+++ b/lib/common/hpglgen.c
@@ -601,7 +601,7 @@ static void hpgl_set_font(char *name, double size)
 
 static void hpgl_set_color(char *name)
 {
-    color_t color;
+    gvcolor_t color;
 
 #ifdef HPDEBUG
     fprintf(stderr, "set color %s\n", name);

diff --git a/lib/common/mpgen.c b/lib/common/mpgen.c
index b5a814603019f167c2083f0b8bc6d90068e92f31..1496f86d24bce48e98c6bd495d6ee68c04d7a80a 100644 (file)
--- a/lib/common/mpgen.c
+++ b/lib/common/mpgen.c
@@ -131,7 +131,7 @@ static void mp_set_font(char *name, double size)
 static void mp_set_color(char *name)
 {
     static char *op[] = { "graph", "node", "edge", "sethsb" };
-    color_t color;
+    gvcolor_t color;
 
     if (strcmp(name, S[SP].color)) {
        colorxlate(name, &color, HSV_DOUBLE);

diff --git a/lib/common/picgen.c b/lib/common/picgen.c
index 2682f88bc50966dd40c548f7eaff819db1709da1..1c694cd5e3c5efe4e6910a770749389ce6217a69 100644 (file)
--- a/lib/common/picgen.c
+++ b/lib/common/picgen.c
@@ -452,7 +452,7 @@ static void pic_textline(point p, textline_t * line)
 
 static void pic_set_color(char *name)
 {
-    color_t color;
+    gvcolor_t color;
 
     S[SP].color = name;
     colorxlate(name, &color, HSV_DOUBLE);
@@ -533,7 +533,7 @@ static void pic_polygon(point * A, int n, int filled)
        pf1 = cvt2ptf(A[0]);    /* opposite */
        pf2 = cvt2ptf(A[2]);    /* corners  */
        if (filled) {
-           color_t color;
+           gvcolor_t color;
 
            colorxlate(S[SP].color, &color, HSV_DOUBLE);
            fprintf(Output_file, "setfillval %f\n", color.u.HSV[2]);

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index c09905c65556311fc5fc3f853a7d100d358e45d0..7f73dfadc744c5c2fb69e792202201ad9893bcdb 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -269,7 +269,7 @@ static void ps_set_font(char *name, double size)
 static void ps_set_color(char *name)
 {
     static char *op[] = { "graph", "node", "edge", "sethsb" };
-    color_t color;
+    gvcolor_t color;
 
     colorxlate(name, &color, HSV_DOUBLE);
     fprintf(Output_file, "%.3f %.3f %.3f %scolor\n",

diff --git a/lib/common/svggen.c b/lib/common/svggen.c
index ca28d91db2ee42087efe4d41bf4b878bcc13d76d..958cd69157f810fe3e2764095aa6ceb67b77abdf 100644 (file)
--- a/lib/common/svggen.c
+++ b/lib/common/svggen.c
@@ -294,7 +294,7 @@ char *svg_resolve_color(char *name, int useKnown)
 
     static char buf[SMALLBUF];
     char *tok;
-    color_t color;
+    gvcolor_t color;
 
     tok = canontoken(name);
     if (!useKnown || (bsearch(&tok, svg_known_colors,

diff --git a/lib/common/vrmlgen.c b/lib/common/vrmlgen.c
index 506698ebaf5993a28f21bcdf5f005baa87a29bfc..04c6f1219d442b64ec7b3c57e8f9c50465d97a11 100644 (file)
--- a/lib/common/vrmlgen.c
+++ b/lib/common/vrmlgen.c
@@ -154,7 +154,7 @@ static FILE *nodefile(node_t * n)
 
 static unsigned char vrml_resolve_color(char *name)
 {
-    color_t color;
+    gvcolor_t color;
 
     if (!(strcmp(name, "transparent"))) {
        /* special case for "transparent" color */
@@ -174,7 +174,7 @@ static void vrml_set_pencolor(char *name)
 
 static void vrml_set_fillcolor(char *name)
 {
-    color_t color;
+    gvcolor_t color;
     cstk[SP].fillcolor = name;
     colorxlate(name, &color, RGBA_BYTE);
     cstk[SP].r = (double) color.u.rgba[0] / 255.0;

diff --git a/lib/common/vtxgen.c b/lib/common/vtxgen.c
index 90fda13b1b96c1a60ad9b195b02740d40c36ed15..26d36b94c107b8500421b6914011c4b2cdb99bd9 100644 (file)
--- a/lib/common/vtxgen.c
+++ b/lib/common/vtxgen.c
@@ -408,7 +408,7 @@ static void vtx_node_style(void)
 
 static void vtx_set_color(char *name)
 {
-    color_t color;
+    gvcolor_t color;
     context_t *cp;
 
     cp = &(cstk[SP]);

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index cead70a8972692caadf59808928228e28428914b..7f02900ef65b3ba71d7b15bfa3c8f39ffee753b7 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -128,7 +128,7 @@ extern "C" {
        int SP;
 
        /* render defaults set from graph */
-       color_t bgcolor;        /* background color */
+       gvcolor_t bgcolor;      /* background color */
 
        /* keybindings for keyboard events */
        gvevent_key_binding_t *keybindings;

diff --git a/lib/gvc/gvcjob.h b/lib/gvc/gvcjob.h
index b72e23bac7334d3954f588ea834a0b301499f687..3d334f0aa9e47383d087567c5b5115d29ffbec90 100644 (file)
--- a/lib/gvc/gvcjob.h
+++ b/lib/gvc/gvcjob.h
@@ -44,7 +44,7 @@ extern "C" {
 
     typedef struct {
        char *fontfam, fontopt;
-       color_t pencolor, fillcolor;
+       gvcolor_t pencolor, fillcolor;
        pen_type pen;
        fill_type fill;
        double penwidth;

diff --git a/lib/gvc/gvplugin_render.h b/lib/gvc/gvplugin_render.h
index 7f1bae9e2d610b8391580f3ab9b6163e6396bec9..aba4aa4b45d159e0f384c1bc138e13ea46e70a24 100644 (file)
--- a/lib/gvc/gvplugin_render.h
+++ b/lib/gvc/gvplugin_render.h
@@ -49,7 +49,7 @@ extern "C" {
                              char *target);
        void (*end_anchor) (GVJ_t * job);
        void (*textline) (GVJ_t * job, pointf p, textline_t * str);
-       void (*resolve_color) (GVJ_t * job, color_t * color);
+       void (*resolve_color) (GVJ_t * job, gvcolor_t * color);
        void (*ellipse) (GVJ_t * job, pointf * A, int filled);
        void (*polygon) (GVJ_t * job, pointf * A, int n, int filled);
        void (*beziercurve) (GVJ_t * job, pointf * A, int n,

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 37148276ca2ab21361165bebf0b3a88d87ff8533..1c94731287390c8035ed3d68b1bfc67805cf623c 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -194,7 +194,7 @@ static int gvrender_comparestr(const void *s1, const void *s2)
 }
 
 static void gvrender_resolve_color(gvrender_features_t * features,
-                                  char *name, color_t * color)
+                                  char *name, gvcolor_t * color)
 {
     char *tok;
     int rc;
@@ -694,7 +694,7 @@ void gvrender_textline(GVJ_t * job, pointf p, textline_t * line)
 void gvrender_set_pencolor(GVJ_t * job, char *name)
 {
     gvrender_engine_t *gvre = job->render.engine;
-    color_t *color = &(job->style->pencolor);
+    gvcolor_t *color = &(job->style->pencolor);
 
     if (gvre) {
        gvrender_resolve_color(job->render.features, name, color);
@@ -714,7 +714,7 @@ void gvrender_set_pencolor(GVJ_t * job, char *name)
 void gvrender_set_fillcolor(GVJ_t * job, char *name)
 {
     gvrender_engine_t *gvre = job->render.engine;
-    color_t *color = &(job->style->fillcolor);
+    gvcolor_t *color = &(job->style->fillcolor);
 
     if (gvre) {
        gvrender_resolve_color(job->render.features, name, color);