all my changes while i was offline.

[chaz/openbox] / openbox / parse.h

diff --git a/openbox/parse.h b/openbox/parse.h
index d77b6924a3c8539dd9958e6347c2b65166bf3217..abd5bb2d7ef718c41ba9c1a72f6e05b639ed9e83 100644 (file)
--- a/openbox/parse.h
+++ b/openbox/parse.h
@@ -2,14 +2,16 @@
 #define __parse_h
 
 #include <glib.h>
+#ifndef NO_TAB_H
 #include "parse.tab.h"
+#endif
 
 typedef enum {
     TOKEN_REAL       = REAL,
     TOKEN_INTEGER    = INTEGER,
     TOKEN_STRING     = STRING,
     TOKEN_IDENTIFIER = IDENTIFIER,
-    TOKEN_BOOL       = BOOL,
+    TOKEN_BOOL       = BOOLEAN,
     TOKEN_LIST,
     TOKEN_LBRACE     = '{',
     TOKEN_RBRACE     = '}',