Fix build error on Xcode6.3.

gavinkwoe · Apr 20, 2015 · 69b6ab1 · 69b6ab1
1 parent fc94c9d
commit 69b6ab1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/framework/mvc/view/css/parser/CSSParser.h b/framework/mvc/view/css/parser/CSSParser.h
@@ -36,7 +36,6 @@
 
 #import "CSSOM.h"
 #import "CSSSelector.h"
-#import "CSSTokenizer.h"
 #import "CSSStyleSheet.h"
 
 #pragma mark -

diff --git a/framework/mvc/view/css/parser/CSSParser.m b/framework/mvc/view/css/parser/CSSParser.m
@@ -31,7 +31,10 @@
 
 #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 
+extern int cssToken;
+
 #import "CSSParser.h"
+#import "CSSTokenizer.h"
 
 @interface CSSParser()
 

diff --git a/framework/mvc/view/css/parser/CSSTokenizer.h b/framework/mvc/view/css/parser/CSSTokenizer.h
@@ -219,6 +219,5 @@ extern char *       yytext;
 extern void         yy_create_input(const char* buffer);
 extern void         yy_delete_input();
 extern int          yyparse(CSSParser *parser);
-int                 cssToken;
 
 #endif	// #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
diff --git a/framework/mvc/view/css/parser/CSSTokenizer.m b/framework/mvc/view/css/parser/CSSTokenizer.m
@@ -1802,6 +1802,8 @@
 
 #import "CSSTokenizer.h"
 
+int cssToken;
+
 void yy_create_input(const char* buffer) {
     yy_scan_bytes(buffer,strlen(buffer));
 }

diff --git a/framework/mvc/view/css/parser/cssom/CSSSelector.h b/framework/mvc/view/css/parser/cssom/CSSSelector.h
@@ -59,7 +59,7 @@ typedef enum CSSSelectorRelation {
     ShadowDescendant
 } CSSSelectorRelation;
 
-enum PseudoType {
+typedef enum PseudoType {
     PseudoUnknown = 0,
     PseudoEmpty,
     PseudoOther,