[PHP-CVS] com php-src: Merge branch 'master' into str_size_and_int64: ext/mysqli/mysqli_nonapi.c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h main/main.c

[Anatol Belski]

Commit:    42b122275475b2dee809aeb0205340c3df3d4b42
Author:    Anatol Belski <a...@php.net>         Thu, 5 Dec 2013 08:37:37 +0100
Parents:   7228ac190a9d703f43fb57b6d6b395ab38e96ac0 
de3b9bc77c046625f743d556854eccfdddf5bf23
Branches:  str_size_and_int64

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=42b122275475b2dee809aeb0205340c3df3d4b42

Log:
Merge branch 'master' into str_size_and_int64

Changed paths:
  MM  ext/mysqli/mysqli_nonapi.c
  MM  ext/mysqlnd/mysqlnd.c
  MM  ext/mysqlnd/mysqlnd.h
  MM  main/main.c


Diff:
diff --cc ext/mysqli/mysqli_nonapi.c
index 26a7276,b5630c3..525f4f4
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@@ -773,11 -773,11 +773,11 @@@ PHP_FUNCTION(mysqli_poll
  {
        zval                    *r_array, *e_array, *dont_poll_array;
        MYSQLND                 **new_r_array = NULL, **new_e_array = NULL, 
**new_dont_poll_array = NULL;
 -      long                    sec = 0, usec = 0;
 +      php_int_t                       sec = 0, usec = 0;
        enum_func_status ret;
-       uint                    desc_num;
+       int                     desc_num;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", 
&r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) {
 +      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!ai|i", 
&r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) {
                return;
        }
        if (sec < 0 || usec < 0) {


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