Patches to allow this to compile fully within Eucalyptus (should be h…

…armless outside).
xhochy · May 9, 2009 · 7536885 · 7536885
1 parent 3df035a
commit 7536885
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/ext/cocoa/src/SyckInput.m b/ext/cocoa/src/SyckInput.m
@@ -4,7 +4,7 @@
 #import "YAMLCocoaCategories.h"
 #import <syck.h>
 
-void cocoa_syck_error_handler( SyckParser *p, char *msg )
+void cocoa_syck_error_handler( SyckParser *p, const char *msg )
 {
 	NSLog(@"syck error:%s position:(%d, %d)", msg, p->linect, p->cursor - p->lineptr);
 }

diff --git a/lib/bytecode.c b/lib/bytecode.c
@@ -8,7 +8,12 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 #include "syck.h"
+
+#if GRAM_FILES_HAVE_TAB_SUFFIX
+#include "gram.tab.h"
+#else
 #include "gram.h"
+#endif
 
 #define QUOTELEN 128
 

diff --git a/lib/bytecode.re b/lib/bytecode.re
@@ -7,7 +7,12 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 #include "syck.h"
+
+#if GRAM_FILES_HAVE_TAB_SUFFIX
+#include "gram.tab.h"
+#else
 #include "gram.h"
+#endif
 
 #define QUOTELEN 128
 

diff --git a/lib/sycklex.h b/lib/sycklex.h
@@ -1,3 +1,7 @@
+#if GRAM_FILES_HAVE_TAB_SUFFIX
+#include "gram.tab.h"
+#else
 #include "gram.h"
+#endif
 
 int sycklex( YYSTYPE *sycklval, SyckParser *parser );
diff --git a/lib/token.c b/lib/token.c
@@ -8,7 +8,12 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 #include "syck.h"
+
+#if GRAM_FILES_HAVE_TAB_SUFFIX
+#include "gram.tab.h"
+#else
 #include "gram.h"
+#endif
 
 /*
  * Allocate quoted strings in chunks

diff --git a/lib/token.re b/lib/token.re
@@ -7,7 +7,12 @@
  * Copyright (C) 2003 why the lucky stiff
  */
 #include "syck.h"
+
+#if GRAM_FILES_HAVE_TAB_SUFFIX
+#include "gram.tab.h"
+#else
 #include "gram.h"
+#endif
 
 /*
  * Allocate quoted strings in chunks