Changes to m4/src/m4.h,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/11/01 22:29:08

Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.1.1.1.2.32
retrieving revision 1.1.1.1.2.33
diff -u -b -r1.1.1.1.2.32 -r1.1.1.1.2.33
--- src/m4.h    1 Nov 2006 13:44:54 -0000       1.1.1.1.2.32
+++ src/m4.h    1 Nov 2006 22:29:08 -0000       1.1.1.1.2.33
@@ -27,6 +27,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <string.h>
 #include <sys/types.h>
 
@@ -64,19 +65,6 @@
 # define OS2 1
 #endif
 
-/* If FALSE is defined, we presume TRUE is defined too.  In this case,
-   merely typedef boolean as being int.  Or else, define these all.  */
-#ifndef FALSE
-/* Do not use `enum boolean': this tag is used in SVR4 <sys/types.h>.  */
-typedef enum { FALSE = 0, TRUE = 1 } boolean;
-#else
-typedef int boolean;
-#endif
-
-#if ! HAVE_MKSTEMP
-int mkstemp (char *);
-#endif
-
 /* Used for version mismatch, when -R detects a frozen file it can't parse.  */
 #define EXIT_MISMATCH 63
 
@@ -228,7 +216,7 @@
 void debug_init (void);
 int debug_decode (const char *);
 void debug_flush_files (void);
-boolean debug_set_output (const char *);
+bool debug_set_output (const char *);
 void debug_message_prefix (void);
 
 void trace_prepre (const char *, int);
@@ -292,12 +280,12 @@
 void skip_line (void);
 
 /* push back input */
-void push_file (FILE *, const char *, boolean);
+void push_file (FILE *, const char *, bool);
 void push_macro (builtin_func *);
 struct obstack *push_string_init (void);
 const char *push_string_finish (void);
 void push_wrapup (const char *);
-boolean pop_wrapup (void);
+bool pop_wrapup (void);
 
 /* current input file, and line */
 extern const char *current_file;
@@ -345,11 +333,11 @@
 struct symbol
 {
   struct symbol *next;
-  boolean traced : 1;
-  boolean shadowed : 1;
-  boolean macro_args : 1;
-  boolean blind_no_args : 1;
-  boolean deleted : 1;
+  bool traced : 1;
+  bool shadowed : 1;
+  bool macro_args : 1;
+  bool blind_no_args : 1;
+  bool deleted : 1;
   int pending_expansions;
 
   char *name;
@@ -370,7 +358,7 @@
 
 typedef enum symbol_lookup symbol_lookup;
 typedef struct symbol symbol;
-typedef void hack_symbol ();
+typedef void hack_symbol (symbol *, void *);
 
 #define HASHMAX 509            /* default, overridden by -Hsize */
 
@@ -379,7 +367,7 @@
 void free_symbol (symbol *sym);
 void symtab_init (void);
 symbol *lookup_symbol (const char *, symbol_lookup);
-void hack_all_symbols (hack_symbol *, const char *);
+void hack_all_symbols (hack_symbol *, void *);
 
 /* File: macro.c  --- macro expansion.  */
 
@@ -391,9 +379,9 @@
 struct builtin
 {
   const char *name;
-  boolean gnu_extension : 1;
-  boolean groks_macro_args : 1;
-  boolean blind_if_no_args : 1;
+  bool gnu_extension : 1;
+  bool groks_macro_args : 1;
+  bool blind_if_no_args : 1;
   builtin_func *func;
 };
 
@@ -430,7 +418,7 @@
 typedef int eval_t;
 typedef unsigned int unsigned_eval_t;
 
-boolean evaluate (const char *, eval_t *);
+bool evaluate (const char *, eval_t *);
 
 /* File: format.c  --- printf like formatting.  */