partially back out previous commit - leave 2 colorxlate functions

diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
index cb079ada4dbf629881ea96dfa647a823eb1474ec..f0ba9232cce654e8db3848d7b4ba6ed3d59bd9da 100644 (file)
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
@@ -1045,6 +1045,7 @@ static char* resolveColor (char* str)
 
 #undef S
 
+static
 int colorxlate(char *str, gvcolor_t * color, color_type_t target_type)
 {
     static hsvrgbacolor_t *last;

diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
index 55083347e5fb5de0da2d8b48992c7cabf129e5e0..514a64a4cbe15eeb27e800b96a921704ba838805 100644 (file)
--- a/lib/gvpr/actions.h
+++ b/lib/gvpr/actions.h
@@ -20,7 +20,6 @@ extern "C" {
 
 #include "cgraph.h"
 #include "expr.h"
-#include "color.h"
 
     extern void nodeInduce(Agraph_t * selected);
     extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj);
@@ -50,7 +49,6 @@ extern "C" {
     extern char *toLower(Expr_t * pgm, char *, Sfio_t*);
     extern char *toUpper(Expr_t * pgm, char *, Sfio_t*);
     extern int deleteObj(Agraph_t * g, Agobj_t * obj);
-    extern int colorxlate(char *str, gvcolor_t * color, color_type_t target_type);
     extern char *colorx (Expr_t* ex, char* incolor, char* fmt, Sfio_t* fp);
     extern void gvstart_timer(void);
     extern double gvelapsed_sec(void);