- Update .dsp's

- Make non ZTS Win32 build again

5 files changed, 30 insertions, 14 deletions

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 30cdfaf292..2064675418 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -101,7 +101,8 @@ int php_get_ftp_result(int socketd);
 
 HashTable fopen_url_wrappers_hash;
 
-PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)) {
+PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path))
+{
 #if PHP_URL_FOPEN
 	return zend_hash_add(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1, &wrapper, sizeof(wrapper), NULL);
 #else
@@ -109,7 +110,8 @@ PHPAPI int php_register_url_wrapper(char *protocol, FILE * (*wrapper)(const char
 #endif
 }
 
-PHPAPI int php_unregister_url_wrapper(char *protocol) {
+PHPAPI int php_unregister_url_wrapper(char *protocol)
+{
 #if PHP_URL_FOPEN
 	return zend_hash_del(&fopen_url_wrappers_hash, protocol, strlen(protocol)+1);
 #else
diff --git a/main/main.c b/main/main.c
index 27787c6cd3..927fd77200 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1184,7 +1184,7 @@ PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC)
 	}
 
 #ifdef PHP_WIN32
-	UpdateIniFromRegistry(primary_file->filename);
+	UpdateIniFromRegistry(file->filename);
 #endif
 
 	EG(main_op_array) = zend_compile_files(ZEND_REQUIRE CLS_CC, 1, file);
diff --git a/main/php_main.h b/main/php_main.h
index 9b76886066..6f0f0f2ae2 100644
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -41,6 +41,8 @@ PHPAPI int php_global_startup_extensions(zend_module_entry **ptr, int count);
 PHPAPI int php_global_shutdown_extensions(zend_module_entry **ptr, int count);
 
 PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC);
+PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC);
+
 
 extern void php_call_shutdown_functions(void);
 
diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c
index a248bea38d..ff8479b55c 100644
--- a/main/php_virtual_cwd.c
+++ b/main/php_virtual_cwd.c
@@ -43,7 +43,7 @@
 #endif
 
 /* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */
-#ifdef ZEND_WIN32
+#if defined(ZEND_WIN32) && defined(ZTS)
 MUTEX_T cwd_mutex;
 #endif
 
@@ -177,7 +177,7 @@ CWD_API void virtual_cwd_startup(void)
 	main_cwd_state.cwd_length = strlen(cwd);
 
 	ZEND_INIT_MODULE_GLOBALS(cwd, cwd_globals_ctor, cwd_globals_dtor);
-#ifdef ZEND_WIN32
+#if defined(ZEND_WIN32) && defined(ZTS)
 	cwd_mutex = tsrm_mutex_alloc();
 #endif
 }
@@ -197,7 +197,7 @@ CWD_API void virtual_cwd_shutdown(void)
 #ifndef ZTS
 	cwd_globals_dtor(&cwd_globals);
 #endif
-#ifdef ZEND_WIN32
+#if defined(ZEND_WIN32) && defined(ZTS)
 	tsrm_mutex_free(cwd_mutex);
 #endif
 
@@ -659,14 +659,18 @@ CWD_API FILE *virtual_popen(const char *command, const char *type)
 	if (!getcwd_result) {
 		return NULL;
 	}
-	
+
+#ifdef ZTS
 	tsrm_mutex_lock(cwd_mutex);
+#endif
 
 	chdir(CWDG(cwd).cwd);
 	retval = popen(command, type);
 	chdir(prev_cwd);
 
+#ifdef ZTS
 	tsrm_mutex_unlock(cwd_mutex);
+#endif
 
 	return retval;
 }
diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index ef3c5c6c05..1e72135fc2 100644
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -333,6 +333,10 @@ SOURCE=..\ext\standard\browscap.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\ext\standard\crc32.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\ext\standard\datetime.c

 # End Source File

 # Begin Source File

@@ -385,6 +389,10 @@ SOURCE=..\ext\standard\image.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\ext\standard\incomplete_class.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\ext\standard\info.c

 # End Source File

 # Begin Source File

@@ -788,12 +796,12 @@ SOURCE=..\ext\pcre\pcrelib\pcre.h
 # Begin Source File

 

 SOURCE=..\ext\wddx\wddx.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # Begin Source File

 

 SOURCE=..\ext\xml\xml.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # End Group

 # Begin Group "Header Files No. 4"

@@ -813,22 +821,22 @@ SOURCE=..\ext\xml\php_xml.h
 # Begin Source File

 

 SOURCE=..\ext\xml\expat\xmlparse\hashtable.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # Begin Source File

 

 SOURCE=..\ext\xml\expat\xmlparse\xmlparse.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # Begin Source File

 

 SOURCE=..\ext\xml\expat\xmltok\xmlrole.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # Begin Source File

 

 SOURCE=..\ext\xml\expat\xmltok\xmltok.c

-# ADD CPP /I "..\Zend" /I ".." /I "..\regex" /I "..\..\bindlib_w32" /I "..\main" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"

 # End Source File

 # End Group

 # Begin Group "Header Files No. 5"

@@ -920,7 +928,7 @@ SOURCE=..\win32\wfile.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\dl\snmp\winsnmp.c

+SOURCE=..\ext\snmp\winsnmp.c

 # End Source File

 # Begin Source File