don't include the y.tab.h inside the yacc file

diff --git a/openbox/parse.h b/openbox/parse.h
index 3c649db10c5f40aa3f3029342c0b5ef4629357ec..9f9eda6d8855edeeba531c7ca8cdaba0a3fa39cc 100644 (file)
--- a/openbox/parse.h
+++ b/openbox/parse.h
@@ -2,7 +2,9 @@
 #define __parse_h
 
 #include <glib.h>
-#include "y.tab.h"
+#ifndef NO_Y_H
+#  include "y.tab.h"
+#endif
 
 typedef enum {
     TOKEN_REAL       = REAL,

diff --git a/openbox/parse.yacc b/openbox/parse.yacc
index e9b469e029628ef7f7dbf9ac0c0334c33434ad5f..8043c04a60f8a647fec786ea45d3851cbebfb55f 100644 (file)
--- a/openbox/parse.yacc
+++ b/openbox/parse.yacc
@@ -1,5 +1,8 @@
 %{
+#define NO_Y_H
 #include "parse.h"
+#undef NO_Y_H
+
 #ifdef HAVE_STDIO_H
 #  include <stdio.h>
 #endif