diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-14 11:44:37 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-14 11:44:37 +0800 |
| commit | f3d18add089113a032d785169a6859c8719db307 (patch) | |
| tree | a103f2adbfb485b98c181282cbb8bbcd8ea17a57 /main | |
| parent | bab33f7e05fce2ec3834149826da6cbb1545d962 (diff) | |
| parent | f4dc2240a048050a87a6e3e31573f13a2256cf2e (diff) | |
| download | php-git-f3d18add089113a032d785169a6859c8719db307.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index 90474cd8ee..e3b0e4332a 100644 --- a/main/main.c +++ b/main/main.c @@ -1526,7 +1526,7 @@ int php_request_startup(TSRMLS_D) int retval = SUCCESS; #ifdef HAVE_DTRACE - DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method)); + DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method)); #endif /* HAVE_DTRACE */ #ifdef PHP_WIN32 @@ -1836,7 +1836,7 @@ void php_request_shutdown(void *dummy) #endif #ifdef HAVE_DTRACE - DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method)); + DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method)); #endif /* HAVE_DTRACE */ } /* }}} */ |