From: Stanislav Malyshev <stas@php.net>
Date: Mon, 30 Oct 2000 12:14:37 +0000 (+0000)
Subject: Fix build
X-Git-Tag: php-4.0.4RC3~440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47a84052e51cd8ecbbd679edd9b90c5bfd55e432;p=php

Fix build
# At least, it compiles now...
---

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 9d7af2faa4..f4eba0eae5 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS=foreign
 EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
 noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
 
-libZend_cc_la_SOURCES=zend_language_scanner_cc.cc
-libZend_c_la_SOURCES=zend_language_scanner.c
+libZend_cc_la_SOURCES=zend_language_scanner_cc.cc zend_ini_scanner_cc.cc
+libZend_c_la_SOURCES=zend_language_scanner.c zend_ini_scanner.c
 
 libZend_la_SOURCES=\
 	zend_language_parser.y \
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 830c6a1527..1356005b2a 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -46,7 +46,7 @@
 #endif
 
 #ifndef ZTS
-void init_cfg_scanner()
+void init_ini_scanner()
 {
 	ini_lineno=1;
 }
@@ -116,7 +116,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh)
 	CG(ini_scanner) = new ZendIniFlexLexer;
 	CG(ini_scanner)->switch_streams(fh->handle.is, &cout);
 #else
-	init_cfg_scanner();
+	init_ini_scanner();
 	yyin = fp;
 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 #endif
@@ -132,8 +132,9 @@ void zend_ini_close_file(zend_file_handle *fh)
 			break;
 		case ZEND_HANDLE_STDIOSTREAM: {
 				CLS_FETCH();
-
+#ifdef ZTS
 				delete CG(ini_scanner);
+#endif
 			}
 			break;
 	}