From cd07879f2defd6b3ff04a79adf732ceb51d1627e Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Sat, 24 Apr 1999 09:08:03 +0000
Subject: [PATCH] g++ compile fix

---
 Zend/zend-scanner.l | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 376b5ccbf04..2bb70c71c30 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -398,15 +398,29 @@ 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);
 }
 
 
+const char *zend_get_zendtext(CLS_D)
+{
+	return CG(ZFL)->YYText();
+}
+
+
+int zend_get_zendleng(CLS_D)
+{
+	return CG(ZFL)->YYLeng();
+}
+END_EXTERN_C()
+
+
 void ZendFlexLexer::BeginState(int state)
 {
 	BEGIN(state);
@@ -422,24 +436,6 @@ int yyFlexLexer::yylex()
 #endif
 
 
-
-#ifdef ZTS
-const char *zend_get_zendtext(CLS_D)
-{
-	return CG(ZFL)->YYText();
-}
-
-
-int zend_get_zendleng(CLS_D)
-{
-	return CG(ZFL)->YYLeng();
-}
-#endif
-
-
-END_EXTERN_C()
-
-
 /* redefine YY_INPUT to handle urls for win32*/
 #if 0 /*WIN32|WINNT*/
 #define YY_INPUT(buf,result,max_size) \