- Couple of compile fixes.

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 66d2379630e9abc200ed94053d44ea7f2ca46c82..b6614152f79eb0d57b6d4bcb8e87c1307e22125c 100644 (file)
--- 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 a4ebc4aee95e866371ebffca016f771a86e8c4bf..4b807f2baad5c778668b697f438bc25faeee641f 100644 (file)
--- 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