From: Primhill Computers <remi.chateauneu@primhillcomputers.com>
Date: Mon, 11 Oct 2021 20:51:52 +0000 (+0100)
Subject: Unify usage of preprocessor constant HAVE_GTS.
X-Git-Tag: 2.49.3~10^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98ad9fa960c60c189c0808a05180a12850644c9b;p=graphviz

Unify usage of preprocessor constant HAVE_GTS.
---

diff --git a/lib/neatogen/delaunay.c b/lib/neatogen/delaunay.c
index 4a8e03170..236738d8d 100644
--- a/lib/neatogen/delaunay.c
+++ b/lib/neatogen/delaunay.c
@@ -20,7 +20,7 @@
 #include <common/memory.h>
 #include <common/logic.h>
 
-#if HAVE_GTS
+#if defined(HAVE_GTS)
 #include <gts.h>
 
 static gboolean triangle_is_hole(GtsTriangle * t)
diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index 9be012383..3eb0fd9ea 100644
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -164,7 +164,7 @@ late_smooth (graph_t* g, Agsym_t* sym, int dflt)
     if (!sym) return dflt;
     s = agxget (g, sym);
     if (isdigit(*s)) {
-#if (HAVE_GTS || HAVE_TRIANGLE)
+#if (defined(HAVE_GTS) || defined(HAVE_TRIANGLE))
 	if ((v = atoi (s)) <= SMOOTHING_RNG)
 #else
 	if ((v = atoi (s)) <= SMOOTHING_SPRING)
@@ -182,13 +182,13 @@ late_smooth (graph_t* g, Agsym_t* sym, int dflt)
 	    rv = SMOOTHING_NONE;
 	else if (!strcasecmp(s, "power_dist"))
 	    rv = SMOOTHING_STRESS_MAJORIZATION_POWER_DIST;
-#if (HAVE_GTS || HAVE_TRIANGLE)
+#if (defined(HAVE_GTS) || defined(HAVE_TRIANGLE))
 	else if (!strcasecmp(s, "rng"))
 	    rv = SMOOTHING_RNG;
 #endif
 	else if (!strcasecmp(s, "spring"))
 	    rv = SMOOTHING_SPRING;
-#if (HAVE_GTS || HAVE_TRIANGLE)
+#if (defined(HAVE_GTS) || defined(HAVE_TRIANGLE))
 	else if (!strcasecmp(s, "triangle"))
 	    rv = SMOOTHING_TRIANGLE;
 #endif
@@ -285,7 +285,7 @@ void sfdp_layout(graph_t * g)
 	spring_electrical_control ctrl = spring_electrical_control_new();
 
 	tuneControl (g, ctrl);
-#if (HAVE_GTS || HAVE_TRIANGLE)
+#if (defined(HAVE_GTS) || defined(HAVE_TRIANGLE))
 	graphAdjustMode(g, &am, "prism0");
 #else
 	graphAdjustMode(g, &am, 0);