Remove last vestiges (I hope) of bool, true and false.

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index 8fcefbd0ddcccaea75ec721fbe6bb437114763e5..c1995262f99b9c7d1b9e47991943aa6d3f878440 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -130,7 +130,7 @@ static unsigned char * gvprintnum (int *len, double number)
     static unsigned char tmpbuf[sizeof(maxnegnumstr)];   /* buffer big enough for worst case */
     unsigned char *result = tmpbuf+sizeof(maxnegnumstr); /* init result to end of tmpbuf */
     long int N;
-    bool showzeros, negative;
+    boolean showzeros, negative;
     int digit, i;
 
     /*
@@ -163,7 +163,7 @@ static unsigned char * gvprintnum (int *len, double number)
 #ifdef TERMINATED_NUMBER_STRING
     *--result = '\0';                  /* terminate the result string */
 #endif
-    showzeros = false;                 /* don't print trailing zeros */
+    showzeros = FALSE;                 /* don't print trailing zeros */
     for (i = DECPLACES; N || i > 0; i--) {  /* non zero remainder,
                                                or still in fractional part */
         digit = N % 10;                        /* next least-significant digit */
@@ -171,12 +171,12 @@ static unsigned char * gvprintnum (int *len, double number)
         if (digit || showzeros) {      /* if digit is non-zero,
                                                or if we are printing zeros */
             *--result = digit | '0';   /* convert digit to ascii */
-            showzeros = true;          /* from now on we must print zeros */
+            showzeros = TRUE;          /* from now on we must print zeros */
         }
         if (i == 1) {                  /* if completed fractional part */
             if (showzeros)             /* if there was a non-zero fraction */
                 *--result = '.';       /* print decimal point */
-            showzeros = true;          /* print all digits in int part */
+            showzeros = TRUE;          /* print all digits in int part */
         }
     }
     if (negative)                      /* print "-" if needed */

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 398622bbe345b00d345111956249abb68385a8ca..67717aecb96295d959e1e94c49367953bc1c388c 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -147,7 +147,7 @@ static void svg_size (usershape_t *us)
     char u[10];
     char *token;
     char line[200];
-    bool wFlag = false, hFlag = false;
+    boolean wFlag = FALSE, hFlag = FALSE;
 
     fseek(us->f, -strlen(line), SEEK_CUR);
     while (fgets(line, sizeof(line), us->f) != NULL && (!wFlag || !hFlag)) {
@@ -155,13 +155,13 @@ static void svg_size (usershape_t *us)
         while (token != NULL && token[strlen(token)-1] != '>') {
            if (sscanf(token, "width=\"%lf%2s\"", &n, u) == 2) {
                w = svg_units_convert(n, u);
-               wFlag = true;
+               wFlag = TRUE;
                if (hFlag)
                    break;
            }
            if (sscanf(token, "height=\"%lf%2s\"", &n, u) == 2) {
                h = svg_units_convert(n, u);
-               hFlag = true;
+               hFlag = TRUE;
                 if (wFlag)
                    break;
            }
@@ -366,7 +366,7 @@ boolean gvusershape_file_access(usershape_t *us)
                return false;
            }
            if (usershape_files_open_cnt >= MAX_USERSHAPE_FILES_OPEN)
-               us->nocache = true;
+               us->nocache = TRUE;
            else
                usershape_files_open_cnt++;
        }

diff --git a/lib/pack/ptest.c b/lib/pack/ptest.c
index ed0868e4e75aa72640a83681e23d64ebb6d9f884..1dd6f4e2c45459cbbf53b56f603205698de5f500 100644 (file)
--- a/lib/pack/ptest.c
+++ b/lib/pack/ptest.c
@@ -208,7 +208,7 @@ static void initPos(Agraph_t * g)
     }
 }
 
-static void ptest_nodesize(node_t * n, bool flip)
+static void ptest_nodesize(node_t * n, boolean flip)
 {
     int w;