@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? :-)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 039cbb8bb50d0f7ca08b2a7e5ffda4cb1a3a4e15..7c65958403c85e3b9ecbd05f6a4d42e80899377b 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -367,7 +367,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 #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();

diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index a4ccdd368a00f795ada59ca2684571099be01caf..9db7cd96226efaf64a8541953253984984b59b0b 100644 (file)
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -51,6 +51,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
 

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index d0a42a25b6828de247d613907e1d619056a315ec..13696fa9634876798917ea01da39da937530a21d 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -118,7 +118,7 @@ PHP_FUNCTION(session_set_save_handler);
 #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
@@ -153,6 +153,8 @@ void session_adapt_uris(const char *, uint, char **, uint *);
 #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
 #include "ext/wddx/php_wddx_api.h"

diff --git a/ext/session/session.c b/ext/session/session.c
index 490162820eaa319ab78001042dc7a87f23cb15a0..a09a9ec7196b88f1c055709b6d4bb8e36ec5b28d 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -316,7 +316,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
 
 #endif
 
-static void php_session_track_init()
+static void php_session_track_init(void)
 {
        PSLS_FETCH();
        ELS_FETCH();

diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index 9b76f094c2c0d30df7fbea84fbfa7c5794d0f596..cc0a360e25a3201ba934471f224d69bcaa580457 100644 (file)
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -93,7 +93,7 @@ typedef struct {
 #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

diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index b42eaed6b1b1bc98f752f7d76a04921f57f91bab..46ec921fc830f0899f79162afed19e34e3102c33 100644 (file)
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -77,6 +77,8 @@ PHP_FUNCTION(array_reverse);
 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 */

diff --git a/ext/standard/php_metaphone.h b/ext/standard/php_metaphone.h
index 7001e3316e88b2caca994da1ddb07280e706ec94..14991b4fe930f7a1ca19d822b5e5da21f0ccbacd 100644 (file)
--- a/ext/standard/php_metaphone.h
+++ b/ext/standard/php_metaphone.h
@@ -21,6 +21,7 @@
 #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
 

diff --git a/main.h b/main.h
index 8ed815edbc6a21e74f9e83a9bdae94023a7cb314..f02a0af8302d7a594121ec2ec076b26a421e347e 100644 (file)
--- a/main.h
+++ b/main.h
@@ -32,8 +32,8 @@ PHPAPI int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC);
 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);

diff --git a/pear/Makefile.am b/pear/Makefile.am
index c628f39e027c0c0d0910d0f7e9922073c8258ee0..17986749071c0fe5a30fb148f9925da00fceff94 100644 (file)
--- a/pear/Makefile.am
+++ b/pear/Makefile.am
@@ -6,4 +6,6 @@ pear_DBdir=$(prefix)/lib/php/DB
 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)