Make mapbool available via logic.h.

diff --git a/lib/common/input.c b/lib/common/input.c
index 233a226798ed6e8f358178b3b53bb54340695a6d..88b66643ade112a8339f9d95ca154af87b28b669 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -16,6 +16,7 @@
 
 #include <ctype.h>
 #include "render.h"
+#include "logic.h"
 #include "htmltable.h"
 
 static char *usageFmt =

diff --git a/lib/common/logic.h b/lib/common/logic.h
index 14549b953179f9cfa0aae2493b4c062b4c0839d6..3f790deec13f09de0089e1638d5e63df0af9bee3 100644 (file)
--- a/lib/common/logic.h
+++ b/lib/common/logic.h
@@ -25,14 +25,18 @@ extern "C" {
 #include <stdbool.h>
 #endif
 
+#ifndef NOT
 #define NOT(v) (!(v))
+#endif
 
+#if 0
 /* HAVE_BOOL only tested the CC compiler, we know C++ must define bool */
 #if ! defined HAVE_BOOL && ! defined __cplusplus
 typedef unsigned char bool;
 #define false 0
 #define true NOT(false)
 #endif
+#endif
 
 #ifndef FALSE
 #define        FALSE false
@@ -53,6 +57,7 @@ typedef unsigned char bool;
 #define NIL(type) ((type)0)
 #endif
 
+    extern unsigned char mapbool(char *);
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 32f0883eec208b86f6cffb250a329d5e7aaa1d45..80026cf9955e45c38689b559d78305c468ed5769 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -15,6 +15,7 @@
 **********************************************************/
 
 #include "render.h"
+#include "logic.h"
 #include "htmltable.h"
 #include <limits.h>
 

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 4be46fe7d874b8951765db7661b287969c866db2..8325440b20511b9bce806fc9aae26e11639a8225 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -19,6 +19,7 @@
 #include "htmltable.h"
 #include "entities.h"
 #include "ps.h"
+#include "logic.h"
 
 #ifndef WIN32
 #include <unistd.h>
@@ -450,7 +451,7 @@ int maptoken(char *p, char **name, int *val)
     return val[i];
 }
 
-boolean mapbool(char *p)
+unsigned char mapbool(char *p)
 {
     if (p == NULL)
        return FALSE;

diff --git a/lib/common/utils.h b/lib/common/utils.h
index a53de38597aa31332889533f2a32a67dcb057c86..328872581a7ad41cca4e2adecd590de42d5d490f 100644 (file)
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -47,7 +47,6 @@ extern "C" {
     extern void cat_libfile(FILE *of, char **arglib, char **stdlib);
     extern void cat_preamble(GVJ_t *job, char **arglib);
 
-    extern boolean mapbool(char *);
     extern int maptoken(char *, char **, int *);
 
     extern int test_toggle(void);

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index ac0448b5474fa44119e4d4bd720a75ed95504a1b..8fcefbd0ddcccaea75ec721fbe6bb437114763e5 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -42,12 +42,12 @@
 #include <zlib.h>
 #endif
 
-#include "logic.h"
 #include "const.h"
 #include "gvplugin_device.h"
 #include "gvcjob.h"
 #include "gvcint.h"
 #include "gvcproc.h"
+#include "logic.h"
 
 static const int PAGE_ALIGN = 4095;            /* align to a 4K boundary (less one), typical for Linux, Mac OS X and Windows memory allocation */