diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
| commit | a4a120d66aaf44cd0dc71f39a49998b924c2ef0e (patch) | |
| tree | f48300cf85374f82a437a42f3a2d4ed88867f34d /ext/mysqlnd/mysqlnd_wireprotocol.h | |
| parent | 8a7e2f8dd2116ff6ada654e301c593accf337250 (diff) | |
| parent | 05c309f2d85bcc33e95415d7f50d7748a7c27498 (diff) | |
| download | php-git-a4a120d66aaf44cd0dc71f39a49998b924c2ef0e.tar.gz | |
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 26dd4c65ae..be71d06508 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2013 The PHP Group | + | Copyright (c) 2006-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -302,6 +302,7 @@ PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * c unsigned long php_mysqlnd_net_field_length(zend_uchar **packet); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length); +size_t php_mysqlnd_net_store_length_size(uint64_t length); PHPAPI const extern char * const mysqlnd_empty_string; |