andi Sun Feb 19 05:05:42 2006 UTC
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/gd php_gd.h
Log:
- Couple of compile fixes.
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.76 php-src/ext/curl/interface.c:1.77
--- php-src/ext/curl/interface.c:1.76 Sun Feb 19 03:07:38 2006
+++ php-src/ext/curl/interface.c Sun Feb 19 05:05:42 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.76 2006/02/19 03:07:38 andi Exp $ */
+/* $Id: interface.c,v 1.77 2006/02/19 05:05:42 andi Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -157,8 +157,8 @@
#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 @@
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;
\
}
\
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/php_gd.h?r1=1.65&r2=1.66&diff_format=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.65 php-src/ext/gd/php_gd.h:1.66
--- php-src/ext/gd/php_gd.h:1.65 Sun Feb 19 00:55:19 2006
+++ php-src/ext/gd/php_gd.h Sun Feb 19 05:05:42 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.65 2006/02/19 00:55:19 andi Exp $ */
+/* $Id: php_gd.h,v 1.66 2006/02/19 05:05:42 andi Exp $ */
#ifndef PHP_GD_H
#define 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-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
