[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/src/m4.h,v [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/src/m4.h,v [branch-1_4] |
Date: |
Mon, 05 Feb 2007 13:43:37 +0000 |
CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 07/02/05 13:43:36
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.1.1.1.2.37
retrieving revision 1.1.1.1.2.38
diff -u -b -r1.1.1.1.2.37 -r1.1.1.1.2.38
--- src/m4.h 28 Jan 2007 01:54:44 -0000 1.1.1.1.2.37
+++ src/m4.h 5 Feb 2007 13:43:36 -0000 1.1.1.1.2.38
@@ -86,6 +86,15 @@
typedef struct token_data token_data;
typedef void builtin_func (struct obstack *, int, token_data **);
+/* Gnulib's stdbool doesn't work with bool bitfields. For nicer
+ debugging, use bool when we know it works, but use the more
+ portable unsigned int elsewhere. */
+#if __GNUC__ > 2
+typedef bool bool_bitfield;
+#else
+typedef unsigned int bool_bitfield;
+#endif /* ! __GNUC__ */
+
/* Take advantage of GNU C compiler source level optimization hints,
using portable macros. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 6)
@@ -336,11 +345,11 @@
struct symbol
{
struct symbol *next;
- bool traced : 1;
- bool shadowed : 1;
- bool macro_args : 1;
- bool blind_no_args : 1;
- bool deleted : 1;
+ bool_bitfield traced : 1;
+ bool_bitfield shadowed : 1;
+ bool_bitfield macro_args : 1;
+ bool_bitfield blind_no_args : 1;
+ bool_bitfield deleted : 1;
int pending_expansions;
char *name;
@@ -382,9 +391,9 @@
struct builtin
{
const char *name;
- bool gnu_extension : 1;
- bool groks_macro_args : 1;
- bool blind_if_no_args : 1;
+ bool_bitfield gnu_extension : 1;
+ bool_bitfield groks_macro_args : 1;
+ bool_bitfield blind_if_no_args : 1;
builtin_func *func;
};
- Changes to m4/src/m4.h,v [branch-1_4],
Eric Blake <=