From: Emden R. Gansner <erg@alum.mit.edu>
Date: Fri, 24 Oct 2014 17:37:18 +0000 (-0400)
Subject: Fix name clash in smyrna due to gvpr including colxlate.c, and smyrna uses
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ea80b4f62de9baca4f7ca9dca423e41110fafe9;p=graphviz

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 47cbb23d9..08f3ea614 100644
--- 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: