[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_fe.c trunk/ext/mysqli/mysqli_fe.c

2010-10-04 Thread Ulf Wendel
uw   Mon, 04 Oct 2010 10:43:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303978

Log:
Next one... ext/mysqli/mysqli_fe.c, line [many]: warning: syntax error:  empty 
declaration

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
U   php/php-src/trunk/ext/mysqli/mysqli_fe.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-10-04 10:40:16 UTC 
(rev 303977)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-10-04 10:43:21 UTC 
(rev 303978)
@@ -45,22 +45,22 @@

 ZEND_BEGIN_ARG_INFO(arginfo_mysqli_stmt_bind_result, 1)
MYSQLI_ZEND_ARG_OBJ_INFO_STMT()
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_mysqli_stmt_bind_param, 1)
MYSQLI_ZEND_ARG_OBJ_INFO_STMT()
ZEND_ARG_INFO(0, types)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_class_mysqli_stmt_bind_result, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_class_mysqli_stmt_bind_param, 1)
ZEND_ARG_INFO(0, types)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4)
ZEND_ARG_ARRAY_INFO(1, read, 1)
@@ -68,7 +68,7 @@
ZEND_ARG_ARRAY_INFO(1, error, 1)
ZEND_ARG_INFO(0, sec)
ZEND_ARG_INFO(0, usec)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_no_params, 0, 0, 0)
 ZEND_END_ARG_INFO()

Modified: php/php-src/trunk/ext/mysqli/mysqli_fe.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_fe.c2010-10-04 10:40:16 UTC (rev 
303977)
+++ php/php-src/trunk/ext/mysqli/mysqli_fe.c2010-10-04 10:43:21 UTC (rev 
303978)
@@ -45,22 +45,22 @@

 ZEND_BEGIN_ARG_INFO(arginfo_mysqli_stmt_bind_result, 1)
MYSQLI_ZEND_ARG_OBJ_INFO_STMT()
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_mysqli_stmt_bind_param, 1)
MYSQLI_ZEND_ARG_OBJ_INFO_STMT()
ZEND_ARG_INFO(0, types)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_class_mysqli_stmt_bind_result, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(arginfo_class_mysqli_stmt_bind_param, 1)
ZEND_ARG_INFO(0, types)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4)
ZEND_ARG_ARRAY_INFO(1, read, 1)
@@ -68,7 +68,7 @@
ZEND_ARG_ARRAY_INFO(1, error, 1)
ZEND_ARG_INFO(0, sec)
ZEND_ARG_INFO(0, usec)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_no_params, 0, 0, 0)
 ZEND_END_ARG_INFO()

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_fe.c trunk/ext/mysqli/mysqli_fe.c

2010-08-25 Thread Andrey Hristov
andrey   Wed, 25 Aug 2010 15:02:02 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=302775

Log:
fix the build. two mysqli functions were missing after
recent commit - set_charset and get_charset

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
U   php/php-src/trunk/ext/mysqli/mysqli_fe.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-08-25 14:27:39 UTC 
(rev 302774)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-08-25 15:02:02 UTC 
(rev 302775)
@@ -31,6 +31,7 @@
 #include ext/standard/info.h
 #include php_mysqli_structs.h
 #include mysqli_fe.h
+#include mysqli_priv.h

 #if PHP_VERSION_ID = 50399
 #define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)

Modified: php/php-src/trunk/ext/mysqli/mysqli_fe.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_fe.c2010-08-25 14:27:39 UTC (rev 
302774)
+++ php/php-src/trunk/ext/mysqli/mysqli_fe.c2010-08-25 15:02:02 UTC (rev 
302775)
@@ -31,6 +31,7 @@
 #include ext/standard/info.h
 #include php_mysqli_structs.h
 #include mysqli_fe.h
+#include mysqli_priv.h

 #if PHP_VERSION_ID = 50400
 #define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php