From 9a4e9c6c11dbce549db3667463a148cd6c6a4074 Mon Sep 17 00:00:00 2001
From: arif <devnull@localhost>
Date: Mon, 19 Jan 2009 18:18:07 +0000
Subject: [PATCH] static windows build compatibility
---
lib/common/geom.c | 13 ++++++++++---
lib/common/geomprocs.h | 9 +++++++++
lib/common/utils.c | 9 ++++++---
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/lib/common/geom.c b/lib/common/geom.c
index 9f3febb89..126cca43d 100644
--- a/lib/common/geom.c
+++ b/lib/common/geom.c
@@ -193,8 +193,10 @@ int lineToBox(pointf p, pointf q, boxf b)
}
return -1;
}
-
-inline void rect2poly(pointf *p)
+#ifdef WIN32_STATIC
+#define inline
+#endif
+void rect2poly(pointf *p)
{
p[3].x = p[2].x = p[1].x;
p[2].y = p[1].y;
@@ -357,7 +359,7 @@ inline box flip_rec_box(box b, point p)
return r;
}
-inline boxf flip_rec_boxf(boxf b, pointf p)
+boxf flip_rec_boxf(boxf b, pointf p)
{
boxf r;
/* flip box */
@@ -373,6 +375,11 @@ inline boxf flip_rec_boxf(boxf b, pointf p)
return r;
}
+#ifdef WIN32_STATIC
+#undef inline
+#endif
+
+
#define SMALL 0.0000000001
/* ptToLine2:
diff --git a/lib/common/geomprocs.h b/lib/common/geomprocs.h
index daf0c691e..2cb7d56a8 100644
--- a/lib/common/geomprocs.h
+++ b/lib/common/geomprocs.h
@@ -53,6 +53,11 @@ extern void rect2poly(pointf *p);
extern int line_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p);
+#ifdef WIN32_STATIC
+#define inline __inline
+#endif
+
+
static inline point pointof(int x, int y)
{
point r;
@@ -256,6 +261,10 @@ static inline pointf scale (double c, pointf p)
r.y = c * p.y;
return r;
}
+#ifdef WIN32_STATIC
+#undef inline
+#endif
+
#undef extern
#ifdef __cplusplus
}
diff --git a/lib/common/utils.c b/lib/common/utils.c
index 9dd177572..2e29179e7 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1760,8 +1760,10 @@ void setEdgeType (graph_t* g, int dflt)
GD_flags(g) |= et;
}
+#ifndef WIN32_STATIC
#ifndef HAVE_STRCASECMP
+
#include <string.h>
#include <ctype.h>
@@ -1779,9 +1781,10 @@ int strcasecmp(const char *s1, const char *s2)
}
#endif /* HAVE_STRCASECMP */
+#endif /*WIN32_STATIC*/
-#ifndef HAVE_STRNCASECMP
-
+#ifndef WIN32_STATIC
+#ifndef HAVE_STRCASECMP
#include <string.h>
#include <ctype.h>
@@ -1803,7 +1806,7 @@ int strncasecmp(const char *s1, const char *s2, unsigned int n)
}
#endif /* HAVE_STRNCASECMP */
-
+#endif
void gv_free_splines(edge_t * e)
{
int i;
--
2.40.0