g++ compile fix

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 376b5ccbf048a4eabc76f0e521b04e199bef2195..2bb70c71c30a721718f4eaf2b2584f70ada4b80b 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -398,46 +398,42 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_
        zval_dtor(str);
        return SUCCESS;
 }
-
+END_EXTERN_C()
 
 #ifdef ZTS
+BEGIN_EXTERN_C()
 int lex_scan(zval *zendlval CLS_DC)
 {
        return CG(ZFL)->lex_scan(zendlval CLS_CC);
 }
 
 
-void ZendFlexLexer::BeginState(int state)
+const char *zend_get_zendtext(CLS_D)
 {
-       BEGIN(state);
+       return CG(ZFL)->YYText();
 }
 
 
-int yyFlexLexer::yylex()
+int zend_get_zendleng(CLS_D)
 {
-       fprintf(stderr, "Error:  yyFlexLexer::yylex() called\n");
-       return -1;
+       return CG(ZFL)->YYLeng();
 }
-
-#endif
-
+END_EXTERN_C()
 
 
-#ifdef ZTS
-const char *zend_get_zendtext(CLS_D)
+void ZendFlexLexer::BeginState(int state)
 {
-       return CG(ZFL)->YYText();
+       BEGIN(state);
 }
 
 
-int zend_get_zendleng(CLS_D)
+int yyFlexLexer::yylex()
 {
-       return CG(ZFL)->YYLeng();
+       fprintf(stderr, "Error:  yyFlexLexer::yylex() called\n");
+       return -1;
 }
-#endif
 
-
-END_EXTERN_C()
+#endif
 
 
 /* redefine YY_INPUT to handle urls for win32*/