M openbox/parse.h → openbox/parse.h

@@ -5,11 +5,11 @@ #include <glib.h>
 #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     = '{',

M openbox/parse.l → openbox/parse.l

@@ -1,11 +1,8 @@ 
 %{
-#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;
 %}