summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2011-05-16 15:52:31 +0000
committerRasmus Lerdorf <rasmus@php.net>2011-05-16 15:52:31 +0000
commite0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce (patch)
treeb7ccb864b7926c0b6ca47aa261c3c342596fc8f9
parent0179c5a0e604f4b2181740fd1a0d6ed1f2a887f6 (diff)
downloadphp-git-e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce.tar.gz
Fix a couple of warnings. Use %zu to printf a time_t and get_request_time
actually returns a double, not a time_t.
-rw-r--r--main/SAPI.h2
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/SAPI.h b/main/SAPI.h
index 3966b2d5aa..aca4179430 100644
--- 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 0d1cad0630..48eea2b6fb 100644
--- 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();