Add stdbool.h plus fallback to h/nmh.h.

Change h/mh.h's FALSE and TRUE to use stdbool.h's.  In time, everything
can switch over and FALSE and TRUE can go.  Delete some local
re-definitions of FALSE and TRUE.

diff --git a/h/mh.h b/h/mh.h
index d88df07..513248c 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -25,10 +25,10 @@
 #define NMH_BUFSIZ  (BUFSIZ>=8192 ? BUFSIZ : 8192)
 
 #ifndef FALSE
-#define FALSE 0
+#define FALSE false
 #endif
 #ifndef TRUE
-#define TRUE 1
+#define TRUE true
 #endif
 typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 

diff --git a/h/nmh.h b/h/nmh.h
index 2468919..ed02240 100644 (file)
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -15,6 +15,15 @@
 # include <sbr/ctype-checked.h>
 #endif
 #include <assert.h>
+
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# define bool int
+# define true 1
+# define false 0
+#endif
+
 #include <sys/stat.h>
 #include <sys/wait.h>
 

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 8d778e5..26241ae 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -40,9 +40,6 @@
  */
 #endif
 
-#define        TRUE    1
-#define        FALSE   0
-
 #define        NBITS ((sizeof (int)) * 8)
 
 /*

diff --git a/sbr/getline.c b/sbr/getline.c
index 7e3e797..ab653bb 100644 (file)
--- a/sbr/getline.c
+++ b/sbr/getline.c
@@ -10,13 +10,8 @@
 #include <stdio.h>
 #include <limits.h>
 #include <errno.h>
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else  /* ! HAVE_STDBOOL_H */
-# define bool int
-# define true 1
-# define false 0
-#endif /* ! HAVE_STDBOOL_H */
+
+#include <h/mh.h>
 
 /* Largest possible size of buffer that allows SSIZE_MAX to be returned
  * to indicate SSIZE_MAX - 1 characters read before the '\n'.  The

diff --git a/uip/flist.c b/uip/flist.c
index 6a10ad8..68dd3f7 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#define FALSE   0
-#define TRUE    1
-
 /*
  * We allocate space to record the names of folders
  * (foldersToDo array), this number of elements at a time.