[PHP4BETA] CVS update: php4/ext/standard

Date: Monday April 26, 1999 @ 10:00 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv848/ext/standard Modified Files: basic_functions.c basic_functions.h datetime.c head.c head.h info.c info.h post.c post.h Log Message: * 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. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.7 php4/ext/standard/basic_functions.c:1.8 --- php4/ext/standard/basic_functions.c:1.7 Fri Apr 23 20:11:54 1999 +++ php4/ext/standard/basic_functions.c Mon Apr 26 10:00:48 1999 @@ -1752,7 +1752,7 @@ /* }}} */ -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"); Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.1 php4/ext/standard/basic_functions.h:1.2 --- php4/ext/standard/basic_functions.h:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/basic_functions.h Mon Apr 26 10:00:48 1999 @@ -29,7 +29,7 @@ */ -/* $Id: basic_functions.h,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: basic_functions.h,v 1.2 1999/04/26 14:00:48 zeev Exp $ */ #ifndef _BASIC_FUNCTIONS_H #define _BASIC_FUNCTIONS_H @@ -102,7 +102,7 @@ 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); Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.5 php4/ext/standard/datetime.c:1.6 --- php4/ext/standard/datetime.c:1.5 Sat Apr 24 16:48:12 1999 +++ php4/ext/standard/datetime.c Mon Apr 26 10:00:49 1999 @@ -30,7 +30,7 @@ */ -/* $Id: datetime.c,v 1.5 1999/04/24 20:48:12 sas Exp $ */ +/* $Id: datetime.c,v 1.6 1999/04/26 14:00:49 zeev Exp $ */ #include "php.h" @@ -61,10 +61,8 @@ "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] = Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.5 php4/ext/standard/head.c:1.6 --- php4/ext/standard/head.c:1.5 Fri Apr 23 20:11:56 1999 +++ php4/ext/standard/head.c Mon Apr 26 10:00:49 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.5 1999/04/24 00:11:56 zeev Exp $ */ +/* $Id: head.c,v 1.6 1999/04/26 14:00:49 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -67,7 +67,8 @@ return SUCCESS; } -void php3_noheader(void) + +PHPAPI void php3_noheader(void) { php3_PrintHeader = 0; header_called = 1; Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.1 php4/ext/standard/head.h:1.2 --- php4/ext/standard/head.h:1.1 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/head.h Mon Apr 26 10:00:49 1999 @@ -58,9 +58,8 @@ 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 Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.6 php4/ext/standard/info.c:1.7 --- php4/ext/standard/info.c:1.6 Fri Apr 23 20:11:56 1999 +++ php4/ext/standard/info.c Mon Apr 26 10:00:49 1999 @@ -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 @@ } -void _php3_info(void) +PHPAPI void _php3_info(void) { char **env,*tmp1,*tmp2; char *php3_uname; Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.1 php4/ext/standard/info.h:1.2 --- php4/ext/standard/info.h:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/standard/info.h Mon Apr 26 10:00:49 1999 @@ -27,7 +27,7 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: info.h,v 1.2 1999/04/26 14:00:49 zeev Exp $ */ #ifndef _INFO_H #define _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 */ Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.3 php4/ext/standard/post.c:1.4 --- php4/ext/standard/post.c:1.3 Fri Apr 23 20:11:57 1999 +++ php4/ext/standard/post.c Mon Apr 26 10:00:49 1999 @@ -393,7 +393,7 @@ } -void php3_TreatHeaders(void) +PHPAPI void php3_TreatHeaders(void) { #if APACHE #if MODULE_MAGIC_NUMBER > 19961007 Index: php4/ext/standard/post.h diff -u php4/ext/standard/post.h:1.1 php4/ext/standard/post.h:1.2 --- php4/ext/standard/post.h:1.1 Wed Apr 21 22:48:25 1999 +++ php4/ext/standard/post.h Mon Apr 26 10:00:49 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: post.h,v 1.1 1999/04/22 02:48:25 ssb Exp $ */ +/* $Id: post.h,v 1.2 1999/04/26 14:00:49 zeev Exp $ */ #ifndef _POST_H #define _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 -- PHP 4 Beta