Fix a couple of warnings. Use %zu to printf a time_t and get_request_time

actually returns a double, not a time_t.

diff --git a/main/SAPI.h b/main/SAPI.h
index 3966b2d5aa7082363ade4db1761e417125e46426..aca4179430fa3732afa86e589b11f085f24b767a 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -241,7 +241,7 @@ struct _sapi_module_struct {
 
        void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
        void (*log_message)(char *message TSRMLS_DC);
-       time_t (*get_request_time)(TSRMLS_D);
+       double (*get_request_time)(TSRMLS_D);
        void (*terminate_process)(TSRMLS_D);
 
        char *php_ini_path_override;

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 0d1cad063076c5daeaa9b220aebcb4a871c90c59..48eea2b6fb45ec6837b7d84ee9ab7eb46d542b46 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -670,7 +670,7 @@ zend_first_try {
                }
 
                apr_table_set(r->notes, "mod_php_memory_usage",
-                       apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC)));
+                       apr_psprintf(ctx->r->pool, "%zu", zend_memory_peak_usage(1 TSRMLS_CC)));
        }
 
 } zend_end_try();