Index: src/m4.h
===================================================================
--- src/m4.h.orig	2006-11-20 07:55:47.000000000 -0600
+++ src/m4.h	2007-02-04 08:34:59.711894000 -0600
@@ -334,11 +334,11 @@
 struct symbol
 {
   struct symbol *next;
-  bool traced : 1;
-  bool shadowed : 1;
-  bool macro_args : 1;
-  bool blind_no_args : 1;
-  bool deleted : 1;
+  unsigned int traced : 1;
+  unsigned int shadowed : 1;
+  unsigned int macro_args : 1;
+  unsigned int blind_no_args : 1;
+  unsigned int deleted : 1;
   int pending_expansions;
 
   char *name;
@@ -380,9 +380,9 @@
 struct builtin
 {
   const char *name;
-  bool gnu_extension : 1;
-  bool groks_macro_args : 1;
-  bool blind_if_no_args : 1;
+  unsigned int gnu_extension : 1;
+  unsigned int groks_macro_args : 1;
+  unsigned int blind_if_no_args : 1;
   builtin_func *func;
 };
 
Index: src/input.c
===================================================================
--- src/input.c.orig	2006-11-20 07:55:47.000000000 -0600
+++ src/input.c	2007-02-04 08:37:04.729621000 -0600
@@ -86,10 +86,12 @@
 	u_s;	/* INPUT_STRING */
       struct
 	{
-	  FILE *fp;		/* input file handle */
-	  bool end : 1;		/* true if peek has seen EOF */
-	  bool close : 1;	/* true if we should close file on pop */
-	  bool advance_line : 1; /* track previous start_of_input_line */
+	  FILE *fp;			 /* input file handle */
+	  unsigned int end : 1;		 /* true if peek has seen EOF */
+	  unsigned int close : 1;	 /* true if we should close file
+					    on pop */
+	  unsigned int advance_line : 1; /* track previous
+					    start_of_input_line */
 	}
 	u_f;	/* INPUT_FILE */
       builtin_func *func;	/* pointer to macro's function */