From: erg <devnull@localhost>
Date: Mon, 7 Mar 2011 18:05:47 +0000 (+0000)
Subject: Remove static function max from dot.c due to Windows conflict.
X-Git-Tag: LAST_LIBGRAPH~32^2~947
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef0632f2ed070fc11112a39b1e325677ccb01a56;p=graphviz

Remove static function max from dot.c due to Windows conflict.
---

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 4765f371c..c6b38d2ee 100644
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -173,16 +173,10 @@ static graph_t *create_test_graph(void)
     return g;
 }
 
-static int max (int a, int b)
-{
-    if (a > b) return a;
-    else return b;
-}
-
 int main(int argc, char **argv)
 {
     graph_t *prev = NULL;
-    int rc = 0;
+    int r, rc = 0;
 #ifndef WITH_CGRAPH
 #endif /* WITH_CGRAPH */
 
@@ -224,11 +218,14 @@ int main(int argc, char **argv)
 	    }
 	    gvLayoutJobs(Gvc, G);  /* take layout engine from command line */
 	    gvRenderJobs(Gvc, G);
-	    rc = max(rc,agreseterrors());
+	    r = agreseterrors();
+	    rc = MAX(rc,r);
 	    prev = G;
 	}
     }
     gvFinalize(Gvc);
     
-    return (max(rc,gvFreeContext(Gvc)));
+
+    r = gvFreeContext(Gvc);
+    return (MAX(rc,r));
 }