cvs: /php4 main.h /php4/ext/mysql php_mysql.c /php4/ext/pcre php_pcre.h /php4/ext/session php_session.h session.c /php4/ext/standard fsock.h
php_array.h php_metaphone.h /php4/pear Makefile.am

ssb Sun Dec 5 05:29:07 1999 EDT Modified files: /php4 main.h /php4/ext/mysql php_mysql.c /php4/ext/pcre php_pcre.h /php4/ext/session php_session.h session.c /php4/ext/standard fsock.h php_array.h php_metaphone.h /php4/pear Makefile.am Log: @Fix warnings compiling in maintainer mode. (Stig) Fix warnings compiling in maintainer mode. Install DB/common.php and DB/mysql.php on "make install". # We still have a warning from http_config.h:97. Rasmus? :-) Index: php4/main.h diff -u php4/main.h:1.10 php4/main.h:1.11 --- php4/main.h:1.10 Fri Jul 16 09:12:41 1999 +++ php4/main.h Sun Dec 5 05:29:03 1999 @@ -18,7 +18,7 @@ */ -/* $Id: main.h,v 1.10 1999/07/16 13:12:41 zeev Exp $ */ +/* $Id: main.h,v 1.11 1999/12/05 10:29:03 ssb Exp $ */ #ifndef _MAIN_H @@ -32,8 +32,8 @@ PHPAPI void php_request_shutdown(void *dummy); PHPAPI void php_request_shutdown_for_exec(void *dummy); PHPAPI int php_module_startup(sapi_module_struct *sf); -PHPAPI void php_module_shutdown(); -PHPAPI void php_module_shutdown_for_exec(); +PHPAPI void php_module_shutdown(void); +PHPAPI void php_module_shutdown_for_exec(void); PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals); PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC); Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.12 php4/ext/mysql/php_mysql.c:1.13 --- php4/ext/mysql/php_mysql.c:1.12 Sat Dec 4 14:15:56 1999 +++ php4/ext/mysql/php_mysql.c Sun Dec 5 05:29:04 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.12 1999/12/04 19:15:56 sas Exp $ */ +/* $Id: php_mysql.c,v 1.13 1999/12/05 10:29:04 ssb Exp $ */ /* TODO: @@ -367,7 +367,7 @@ #endif char *user,*passwd,*host,*socket=NULL,*tmp; char *hashed_details; - int hashed_details_length,port; + int hashed_details_length,port = MYSQL_PORT; MYSQL *mysql; MySLS_FETCH(); PLS_FETCH(); Index: php4/ext/pcre/php_pcre.h diff -u php4/ext/pcre/php_pcre.h:1.15 php4/ext/pcre/php_pcre.h:1.16 --- php4/ext/pcre/php_pcre.h:1.15 Fri Oct 1 10:54:53 1999 +++ php4/ext/pcre/php_pcre.h Sun Dec 5 05:29:05 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.h,v 1.15 1999/10/01 14:54:53 andrei Exp $ */ +/* $Id: php_pcre.h,v 1.16 1999/12/05 10:29:05 ssb Exp $ */ #ifndef _PHP_PCRE_H #define _PHP_PCRE_H @@ -50,6 +50,8 @@ PHP_FUNCTION(preg_split); PHP_FUNCTION(preg_quote); PHP_FUNCTION(preg_grep); + +char *_php_pcre_replace(char *regex, char *subject, char *replace); extern zend_module_entry pcre_module_entry; #define pcre_module_ptr &pcre_module_entry Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.22 php4/ext/session/php_session.h:1.23 --- php4/ext/session/php_session.h:1.22 Sat Dec 4 12:02:04 1999 +++ php4/ext/session/php_session.h Sun Dec 5 05:29:05 1999 @@ -118,7 +118,7 @@ #define PS(v) (ps_globals->v) #define PSLS_FETCH() php_ps_globals *ps_globals = ts_resource(ps_globals_id) #else -#define PSLS_D +#define PSLS_D void #define PSLS_DC #define PSLS_C #define PSLS_CC @@ -152,6 +152,8 @@ #else #define session_adapt_uris(a,b,c,d) do { } while(0) #endif + +void _php_session_auto_start(void *data); #if HAVE_WDDX #define WDDX_SERIALIZER Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.75 php4/ext/session/session.c:1.76 --- php4/ext/session/session.c:1.75 Sat Dec 4 14:46:12 1999 +++ php4/ext/session/session.c Sun Dec 5 05:29:05 1999 @@ -316,7 +316,7 @@ #endif -static void php_session_track_init() +static void php_session_track_init(void) { PSLS_FETCH(); ELS_FETCH(); Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.16 php4/ext/standard/fsock.h:1.17 --- php4/ext/standard/fsock.h:1.16 Fri Dec 3 15:08:24 1999 +++ php4/ext/standard/fsock.h Sun Dec 5 05:29:06 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.16 1999/12/03 20:08:24 rubys Exp $ */ +/* $Id: fsock.h,v 1.17 1999/12/05 10:29:06 ssb Exp $ */ /* Synced with php3 revision 1.24 1999-06-18 [ssb] */ @@ -93,7 +93,7 @@ #define FG(v) (fsock_globals->v) #define FLS_FETCH() php_fsock_globals *fsock_globals = ts_resource(fsock_globals_id) #else -#define FLS_D +#define FLS_D void #define FLS_DC #define FLS_C #define FLS_CC Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.2 php4/ext/standard/php_array.h:1.3 --- php4/ext/standard/php_array.h:1.2 Sun Nov 21 07:37:53 1999 +++ php4/ext/standard/php_array.h Sun Dec 5 05:29:06 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.2 1999/11/21 12:37:53 thies Exp $ */ +/* $Id: php_array.h,v 1.3 1999/12/05 10:29:06 ssb Exp $ */ #ifndef _PHP_ARRAY_H #define _PHP_ARRAY_H @@ -77,6 +77,8 @@ PHP_FUNCTION(array_pad); PHP_FUNCTION(array_flip); +HashTable* _phpi_splice(HashTable *, int, int, zval ***, int, HashTable **); +int multisort_compare(const void *a, const void *b); #define phpext_array_ptr array_module_ptr #endif /* _PHP_ARRAY_H */ Index: php4/ext/standard/php_metaphone.h diff -u php4/ext/standard/php_metaphone.h:1.1 php4/ext/standard/php_metaphone.h:1.2 --- php4/ext/standard/php_metaphone.h:1.1 Mon Sep 13 11:48:32 1999 +++ php4/ext/standard/php_metaphone.h Sun Dec 5 05:29:06 1999 @@ -16,11 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_metaphone.h,v 1.1 1999/09/13 15:48:32 thies Exp $ */ +/* $Id: php_metaphone.h,v 1.2 1999/12/05 10:29:06 ssb Exp $ */ #ifndef _php_metaphone_h #define _php_metaphone_h +char Lookahead(char *word, int how_far); extern zend_module_entry metaphone_module_entry; #define phpext_metaphone_ptr &metaphone_module_entry Index: php4/pear/Makefile.am diff -u php4/pear/Makefile.am:1.3 php4/pear/Makefile.am:1.4 --- php4/pear/Makefile.am:1.3 Mon Nov 29 10:18:01 1999 +++ php4/pear/Makefile.am Sun Dec 5 05:29:06 1999 @@ -6,4 +6,6 @@ install-data-local: -$(mkinstalldirs) $(peardir) $(pear_DBdir) && \ $(INSTALL_DATA) $(srcdir)/DB.php $(peardir) && \ - $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir) + $(INSTALL_DATA) $(srcdir)/DB/common.php $(pear_DBdir) && \ + $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir) && \ + $(INSTALL_DATA) $(srcdir)/DB/mysql.php $(pear_DBdir)