andrey Wed, 02 Dec 2009 11:58:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291586
Log:
fix macro so that 5-byte BIT values are decoded correctly
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2009-12-02 10:30:23 UTC (rev 291585)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2009-12-02 11:58:04 UTC (rev 291586)
@@ -247,10 +247,10 @@
(((uint32_t) (((zend_uchar*) (A))[0])) << 24)))
#define bit_uint5korr(A) ((uint64_t)(((uint32_t) ((zend_uchar) (A)[4])) +\
- (((uint32_t) ((zend_uchar) (A)[3])) << 8) +\
- (((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
- (((uint32_t) ((zend_uchar) (A)[1])) << 24))
+\
- (((uint64_t) ((zend_uchar) (A)[0])) << 32))
+ (((uint32_t) ((zend_uchar*) (A)[3])) << 8) +\
+ (((uint32_t) ((zend_uchar*) (A)[2])) << 16)
+\
+ (((uint32_t) ((zend_uchar*) (A)[1])) << 24))
+\
+ (((uint64_t) ((zend_uchar*) (A)[0])) << 32))
#define bit_uint6korr(A) ((uint64_t)(((uint32_t) (((zend_uchar*)
(A))[5])) +\
(((uint32_t) (((zend_uchar*) (A))[4])) << 8) +\
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-12-02 10:30:23 UTC
(rev 291585)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-12-02 11:58:04 UTC
(rev 291586)
@@ -247,10 +247,10 @@
(((uint32_t) (((zend_uchar*) (A))[0])) << 24)))
#define bit_uint5korr(A) ((uint64_t)(((uint32_t) ((zend_uchar) (A)[4])) +\
- (((uint32_t) ((zend_uchar) (A)[3])) << 8) +\
- (((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
- (((uint32_t) ((zend_uchar) (A)[1])) << 24))
+\
- (((uint64_t) ((zend_uchar) (A)[0])) << 32))
+ (((uint32_t) ((zend_uchar*) (A)[3])) << 8) +\
+ (((uint32_t) ((zend_uchar*) (A)[2])) << 16)
+\
+ (((uint32_t) ((zend_uchar*) (A)[1])) << 24))
+\
+ (((uint64_t) ((zend_uchar*) (A)[0])) << 32))
#define bit_uint6korr(A) ((uint64_t)(((uint32_t) (((zend_uchar*)
(A))[5])) +\
(((uint32_t) (((zend_uchar*) (A))[4])) << 8) +\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
