this should seriously work

diff --git a/openbox/parse.h b/openbox/parse.h
index 3c649db10c5f40aa3f3029342c0b5ef4629357ec..1b72667d0597c3ac11efb8d9f5b7b250d433182d 100644 (file)
--- a/openbox/parse.h
+++ b/openbox/parse.h
@@ -5,11 +5,11 @@
 #include "y.tab.h"
 
 typedef enum {
-    TOKEN_REAL       = REAL,
-    TOKEN_INTEGER    = INTEGER,
-    TOKEN_STRING     = STRING,
-    TOKEN_IDENTIFIER = IDENTIFIER,
-    TOKEN_BOOL       = BOOL,
+    TOKEN_REAL,
+    TOKEN_INTEGER,
+    TOKEN_STRING,
+    TOKEN_IDENTIFIER,
+    TOKEN_BOOL,
     TOKEN_LBRACKET   = '(',
     TOKEN_RBRACKET   = ')',
     TOKEN_LBRACE     = '{',

diff --git a/openbox/parse.l b/openbox/parse.l
index c888b9f1a9fc2752db6404008963ad89dcf35101..bab976c4129c1c8457353adf82281e72169a4edd 100644 (file)
--- a/openbox/parse.l
+++ b/openbox/parse.l
@@ -1,12 +1,9 @@
 %{
-#include <glib.h>
-#include "y.tab.h"
+#include "parse.h"
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
 
-extern void yyerror(char *err);
-
 int yylineno = 1;
 %}