diff options
| author | Andi Gutmans <andi@php.net> | 2006-02-19 05:05:42 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2006-02-19 05:05:42 +0000 |
| commit | c28cff57d18ceb3563ee1e9a33dcc1e48a0bff3c (patch) | |
| tree | b937772a769ba3b7c5c35c60c65e10306a4e2370 | |
| parent | 1efe984d08ccab1d06f062ca157e3bdb2cb7cd57 (diff) | |
| download | php-git-c28cff57d18ceb3563ee1e9a33dcc1e48a0bff3c.tar.gz | |
- Couple of compile fixes.
| -rw-r--r-- | ext/curl/interface.c | 7 | ||||
| -rw-r--r-- | ext/gd/php_gd.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 66d2379630..b6614152f7 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -157,8 +157,8 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); #define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ - if (((PG(open_basedir) && *PG(open_basedir))) && \ - strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ + if ((PG(open_basedir) && *PG(open_basedir)) && \ + strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \ { \ php_url *tmp_url; \ \ @@ -167,8 +167,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); RETURN_FALSE; \ } \ \ - if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) \ - ) { \ + if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) { \ php_url_free(tmp_url); \ RETURN_FALSE; \ } \ diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index a4ebc4aee9..4b807f2baa 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -32,10 +32,9 @@ /* open_basedir and safe_mode checks */ #define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \ - if (!filename || php_check_open_basedir(filename TSRMLS_CC)) \ - ) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \ - RETURN_FALSE; \ + if (!filename || php_check_open_basedir(filename TSRMLS_CC)) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \ + RETURN_FALSE; \ } #define PHP_GDIMG_TYPE_GIF 1 |