diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.h | 2 | ||||
| -rw-r--r-- | ext/session/php_session.h | 4 | ||||
| -rw-r--r-- | ext/session/session.c | 2 | ||||
| -rw-r--r-- | ext/standard/fsock.h | 2 | ||||
| -rw-r--r-- | ext/standard/php_array.h | 2 | ||||
| -rw-r--r-- | ext/standard/php_metaphone.h | 1 |
7 files changed, 11 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 039cbb8bb5..7c65958403 100644 --- 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 a4ccdd368a..9db7cd9622 100644 --- 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 d0a42a25b6..13696fa963 100644 --- 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 490162820e..a09a9ec719 100644 --- 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 9b76f094c2..cc0a360e25 100644 --- 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 b42eaed6b1..46ec921fc8 100644 --- 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 7001e3316e..14991b4fe9 100644 --- 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 |