bjori Thu Jun 15 15:31:55 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-src/ext/dbase dbase.c
/php-src/ext/gd gd.c
Log:
MFH: Revert array type hinting
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.2&r2=1.62.2.14.2.3&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.2
php-src/ext/curl/interface.c:1.62.2.14.2.3
--- php-src/ext/curl/interface.c:1.62.2.14.2.2 Sun Jun 11 01:42:16 2006
+++ php-src/ext/curl/interface.c Thu Jun 15 15:31:54 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.2 2006/06/11 01:42:16 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.3 2006/06/15 15:31:54 bjori Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -207,7 +207,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0)
ZEND_ARG_INFO(0, ch)
- ZEND_ARG_ARRAY_INFO(0, options, 0)
+ ZEND_ARG_INFO(0, options)/* ARRAY_INFO(0, options, 0) */
ZEND_END_ARG_INFO()
static
http://cvs.php.net/viewcvs.cgi/php-src/ext/dbase/dbase.c?r1=1.74.2.2.2.1&r2=1.74.2.2.2.2&diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.74.2.2.2.1
php-src/ext/dbase/dbase.c:1.74.2.2.2.2
--- php-src/ext/dbase/dbase.c:1.74.2.2.2.1 Sun Jun 11 01:42:17 2006
+++ php-src/ext/dbase/dbase.c Thu Jun 15 15:31:54 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.74.2.2.2.1 2006/06/11 01:42:17 bjori Exp $ */
+/* $Id: dbase.c,v 1.74.2.2.2.2 2006/06/15 15:31:54 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -758,13 +758,13 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_dbase_add_record, 0)
ZEND_ARG_INFO(0, identifier)
- ZEND_ARG_ARRAY_INFO(0, data, 0)
+ ZEND_ARG_INFO(0, data) /* ARRAY_INFO(0, data, 0) */
ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_dbase_replace_record, 0)
ZEND_ARG_INFO(0, identifier)
- ZEND_ARG_ARRAY_INFO(0, data, 0)
+ ZEND_ARG_INFO(0, data) /* ARRAY_INFO(0, data, 0) */
ZEND_ARG_INFO(0, recnum)
ZEND_END_ARG_INFO()
@@ -789,7 +789,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_dbase_create, 0)
ZEND_ARG_INFO(0, filename)
- ZEND_ARG_ARRAY_INFO(0, fields, 0)
+ ZEND_ARG_INFO(0, fields) /* ARRAY_INFO(0, fields, 0) */
ZEND_END_ARG_INFO()
static
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.1&r2=1.312.2.20.2.2&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.1 php-src/ext/gd/gd.c:1.312.2.20.2.2
--- php-src/ext/gd/gd.c:1.312.2.20.2.1 Sun Jun 11 20:03:05 2006
+++ php-src/ext/gd/gd.c Thu Jun 15 15:31:54 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.1 2006/06/11 20:03:05 bjori Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.2 2006/06/15 15:31:54 bjori Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -180,7 +180,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_imagesetstyle, 0)
ZEND_ARG_INFO(0, im)
- ZEND_ARG_ARRAY_INFO(0, styles, 0)
+ ZEND_ARG_INFO(0, styles) /* ARRAY_INFO(0, styles, 0) */
ZEND_END_ARG_INFO()
#if HAVE_LIBGD20
@@ -677,7 +677,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
ZEND_ARG_INFO(0, im)
- ZEND_ARG_ARRAY_INFO(0, points, 0)
+ ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
ZEND_ARG_INFO(0, num_pos)
ZEND_ARG_INFO(0, col)
ZEND_END_ARG_INFO()
@@ -685,7 +685,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
ZEND_ARG_INFO(0, im)
- ZEND_ARG_ARRAY_INFO(0, points, 0)
+ ZEND_ARG_INFO(0, points) /* ARRAY_INFO(0, points, 0) */
ZEND_ARG_INFO(0, num_pos)
ZEND_ARG_INFO(0, col)
ZEND_END_ARG_INFO()
@@ -812,7 +812,7 @@
ZEND_ARG_INFO(0, float angle)
ZEND_ARG_INFO(0, font_file)
ZEND_ARG_INFO(0, text)
- ZEND_ARG_ARRAY_INFO(0, extrainfo, 0)
+ ZEND_ARG_INFO(0, extrainfo) /* ARRAY_INFO(0, extrainfo, 0) */
ZEND_END_ARG_INFO()
static
@@ -825,7 +825,7 @@
ZEND_ARG_INFO(0, col)
ZEND_ARG_INFO(0, font_file)
ZEND_ARG_INFO(0, text)
- ZEND_ARG_ARRAY_INFO(0, extrainfo, 0)
+ ZEND_ARG_INFO(0, extrainfo) /* ARRAY_INFO(0, extrainfo, 0) */
ZEND_END_ARG_INFO()
#endif
@@ -957,7 +957,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_imageconvolution, 0)
ZEND_ARG_INFO(0, im)
- ZEND_ARG_ARRAY_INFO(0, matrix3x3, 0)
+ ZEND_ARG_INFO(0, matrix3x3) /* ARRAY_INFO(0, matrix3x3, 0) */
ZEND_ARG_INFO(0, div)
ZEND_ARG_INFO(0, offset)
ZEND_END_ARG_INFO()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
