diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-14 11:44:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-14 11:44:53 +0800 |
| commit | b6fa0b40f7e1f942febdc35513f310a5880c4eb0 (patch) | |
| tree | e5e282c4e754f4a61a11bbdc2308b3fedf3e16c9 /main | |
| parent | f95cd93408997bd03e1811060d1f25680dc66607 (diff) | |
| parent | f3d18add089113a032d785169a6859c8719db307 (diff) | |
| download | php-git-b6fa0b40f7e1f942febdc35513f310a5880c4eb0.tar.gz | |
Merge branch '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 de794ace99..a79a78c0e1 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 */ } /* }}} */ |