Shut up, my lovely compiler; I do not like your warnings

Conflicts:
	Zend/zend_object_handlers.c

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index a5b4dfce95c11a15eecce4e633d7f77b45ff5f65..e29ff00304b6e58f9dca85baa8adf1b386bb263e 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -775,7 +775,7 @@ static ZEND_FUNCTION(opcache_compile_file)
                op_array = persistent_compile_file(&handle, ZEND_INCLUDE TSRMLS_CC);
        } zend_catch {
                EG(current_execute_data) = orig_execute_data;
-               zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s" TSRMLS_CC, handle.filename);
+               zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " could not compile file %s", handle.filename);
        } zend_end_try();
 
        if(op_array != NULL) {

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index df696c5ddd96771202d2f2d66f8b064205571e6c..dad815b35b2e1095831619aadbcde33c99586920 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -976,11 +976,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 /* }}} */
-/* {{{ arginfo ext/standard/dl.c */
-ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
-       ZEND_ARG_INFO(0, extension_filename)
-ZEND_END_ARG_INFO()
-/* }}} */
 /* {{{ dns.c */
 ZEND_BEGIN_ARG_INFO(arginfo_gethostbyaddr, 0)
        ZEND_ARG_INFO(0, ip_address)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index f2c3447bb87efeb8de32582ba91c211224a5e0c6..088ff77769b7400dbde18c61f7f49b58ed8e0922 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -276,12 +276,12 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC)
                if (!val) {
                        val = "";
                }
-               if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), &new_val_len TSRMLS_CC)) {
+               if (sapi_module.input_filter(PARSE_SERVER, key, &val, strlen(val), (unsigned int *)&new_val_len TSRMLS_CC)) {
                        php_register_variable_safe(key, val, new_val_len, track_vars_array TSRMLS_CC);
                }
        APR_ARRAY_FOREACH_CLOSE()
 
-       if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), &new_val_len TSRMLS_CC)) {
+       if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &ctx->r->uri, strlen(ctx->r->uri), (unsigned int *)&new_val_len TSRMLS_CC)) {
                php_register_variable_safe("PHP_SELF", ctx->r->uri, new_val_len, track_vars_array TSRMLS_CC);
        }
 }

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 1f84ab25976c0632a669c86de58a2b3831cde4d5..2ea92fa6f5b9285387a8ec3e8a16905b383b0ce1 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1826,7 +1826,7 @@ int main(int argc, char *argv[])
                unsigned char *p;
                decoded_query_string = strdup(query_string);
                php_url_decode(decoded_query_string, strlen(decoded_query_string));
-               for (p = decoded_query_string; *p &&  *p <= ' '; p++) {
+               for (p = (unsigned char *)decoded_query_string; *p &&  *p <= ' '; p++) {
                        /* skip all leading spaces */
                }
                if(*p == '-') {