From: Emden Gansner <emdenrg@google.com>
Date: Mon, 1 Feb 2016 23:35:02 +0000 (-0500)
Subject: Change type to not conflict on linux.
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da01fffcf6be8c94dcea5b43cd60c05d14eada6e;p=graphviz

Change type to not conflict on linux.
---

diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
index 16a18c9b3..a7372eab2 100644
--- a/plugin/core/gvrender_core_json.c
+++ b/plugin/core/gvrender_core_json.c
@@ -49,11 +49,11 @@ typedef struct {
 typedef struct {
     Agrec_t h;
     int id;
-} gid_t;
+} gvid_t;
 
 #define ID "id"
-#define ND_gid(n) (((gid_t*)aggetrec(n, ID, FALSE))->id) 
-#define ED_gid(n) (((gid_t*)aggetrec(n, ID, FALSE))->id) 
+#define ND_gid(n) (((gvid_t*)aggetrec(n, ID, FALSE))->id) 
+#define ED_gid(n) (((gvid_t*)aggetrec(n, ID, FALSE))->id) 
 
 static void json_begin_graph(GVJ_t *job)
 {
@@ -311,8 +311,8 @@ static void write_graph(Agraph_t * g, GVJ_t * job, int top, state_t* sp)
     int ecnt = 0;
 
     if (top) {
-	aginit(g, AGNODE, ID, sizeof(gid_t), FALSE);
-	aginit(g, AGEDGE, ID, sizeof(gid_t), FALSE);
+	aginit(g, AGNODE, ID, sizeof(gvid_t), FALSE);
+	aginit(g, AGEDGE, ID, sizeof(gvid_t), FALSE);
 	for (np = agfstnode(g); np; np = agnxtnode(g,np)) {
 	    ND_gid(np) = ncnt++;
 	    for (ep = agfstout(g, np); ep; ep = agnxtout(g,ep)) {