* Plenty of thread safety and Win32 work.

* Changed PHP4 to compile as a DLL, both ISAPI and the the CGI run with the same DLL.
* Switched to using the DLL runtime library under Win32.  PHP will NOT work if
  compiled against the static library!
* Removed yesterday's php4libts project (with php4dllts, it's obsolete).

This *does* affect thread-unsafe Windows as well - the thread unsafe CGI is also
dependant on the thread-unsafe DLL.

9 files changed, 14 insertions, 18 deletions

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d2ce463783..d12fcddcea 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1752,7 +1752,7 @@ PHP_FUNCTION(register_shutdown_function)
 /* }}} */
 
 
-void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini)
+ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini)
 {
 	syntax_highlighter_ini->highlight_comment = INI_STR("highlight_comment");
 	syntax_highlighter_ini->highlight_default = INI_STR("highlight_default");
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 4a1e0bcec9..1620c65a79 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -102,7 +102,7 @@ extern void php3_call_user_method(INTERNAL_FUNCTION_PARAMETERS);
 PHP_FUNCTION(register_shutdown_function);
 PHP_FUNCTION(highlight_file);
 PHP_FUNCTION(highlight_string);
-void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini);
+ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini);
 
 PHP_FUNCTION(ob_start);
 PHP_FUNCTION(ob_end_flush);
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 6cf2c37cb5..a58a58c626 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -61,11 +61,9 @@ char *day_short_names[] =
 	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-#ifndef HAVE_TM_ZONE
-#ifndef _TIMEZONE
+#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !(WIN32||WINNT)
 extern time_t timezone;
 #endif
-#endif
 
 static int phpday_tab[2][12] =
 {
diff --git a/ext/standard/head.c b/ext/standard/head.c
index ab8eb483d6..365728abd6 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -67,7 +67,8 @@ int php3_init_head(INIT_FUNC_ARGS)
 	return SUCCESS;
 }
 
-void php3_noheader(void)
+
+PHPAPI void php3_noheader(void)
 {
 	php3_PrintHeader = 0;
 	header_called = 1;
diff --git a/ext/standard/head.h b/ext/standard/head.h
index f71f7c9027..f7b33d73fd 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -58,9 +58,8 @@ extern void php3_SetCookie(INTERNAL_FUNCTION_PARAMETERS);
 
 void php4i_add_header_information(char *header_information);
 
-extern void php3_noheader(void);
-extern PHPAPI int php3_header(void);
-extern void php3_noheader(void);
-extern int php3_headers_unsent(void);
+PHPAPI void php3_noheader(void);
+PHPAPI int php3_header(void);
+int php3_headers_unsent(void);
 
 #endif
diff --git a/ext/standard/info.c b/ext/standard/info.c
index ea90416530..d0add9d66b 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -53,8 +53,6 @@
 #define PHP3_CONF_LONG(directive,value1,value2) \
 	php3_printf("<tr><td bgcolor=\"" ENTRY_NAME_COLOR "\">%s</td><td bgcolor=\"" CONTENTS_COLOR "\">%ld</td><td bgcolor=\"" CONTENTS_COLOR "\">%ld</td></tr>\n",directive,value1,value2);
 
-extern char **environ;
-
 #define SECTION(name)  PUTS("<hr><h2>" name "</h2>\n")
 
 #define ENTRY_NAME_COLOR "#999999"
@@ -76,7 +74,7 @@ static int _display_module_info(php3_module_entry *module)
 }
 
 
-void _php3_info(void)
+PHPAPI void _php3_info(void)
 {
 	char **env,*tmp1,*tmp2;
 	char *php3_uname;
diff --git a/ext/standard/info.h b/ext/standard/info.h
index 41e5483145..49adc456f6 100644
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -35,6 +35,6 @@
 extern void php3_version(INTERNAL_FUNCTION_PARAMETERS);
 extern void php3_info(INTERNAL_FUNCTION_PARAMETERS);
 
-extern void _php3_info(void);
+PHPAPI void _php3_info(void);
 
 #endif /* _INFO_H */
diff --git a/ext/standard/post.c b/ext/standard/post.c
index 21e09d521a..7429cfeb7b 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -393,7 +393,7 @@ void php3_treat_data(int arg, char *str)
 }
 
 
-void php3_TreatHeaders(void)
+PHPAPI void php3_TreatHeaders(void)
 {
 #if APACHE
 #if MODULE_MAGIC_NUMBER > 19961007
diff --git a/ext/standard/post.h b/ext/standard/post.h
index 37920a8978..7ba44c55eb 100644
--- a/ext/standard/post.h
+++ b/ext/standard/post.h
@@ -36,8 +36,8 @@
 #define PARSE_COOKIE 2
 #define PARSE_STRING 3
 
-extern void php3_treat_data(int arg, char *str);
-extern void php3_TreatHeaders(void);
-extern void _php3_parse_gpc_data(char *, char *, pval *track_vars_array);
+void php3_treat_data(int arg, char *str);
+void _php3_parse_gpc_data(char *, char *, pval *track_vars_array);
+PHPAPI void php3_TreatHeaders(void);
 
 #endif