Fix name clash in smyrna due to gvpr including colxlate.c, and smyrna uses

both gvpr and libcommon.

diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
index 47cbb23d909b5767332f121ad66594692410389f..08f3ea6146c45f36f9ef6b244ff849f71bf0973d 100644 (file)
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
@@ -822,6 +822,11 @@ static void *grealloc(void *ptr, size_t size)
     return p;
 }
 
+#define colorxlate(a,b,c) gvpr_colorxlate(a,b,c)
+#define canontoken(s) gvpr_canontoken(s)
+#define colorCvt(o,n) gvpr_colorCvt(o,n)
+#define setColorScheme(s) gvpr_setColorScheme(s)
+
 #include "colxlate.c"
 
 /* colorx: