andrey Thu, 14 Jan 2010 10:35:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293537
Log:
remove redefinition of bit_uint8korr
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
2010-01-14 10:32:05 UTC (rev 293536)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
2010-01-14 10:35:28 UTC (rev 293537)
@@ -369,16 +369,6 @@
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
(((uint32_t) ((zend_uchar) (A)[3])) << 24))
-
-#define bit_uint8korr(A) ((uint64_t)(((uint32_t) (((zend_uchar*) (A))[7])) +\
-
(((uint32_t) (((zend_uchar*) (A))[6])) << 8) +\
-
(((uint32_t) (((zend_uchar*) (A))[5])) << 16) +\
-
(((uint32_t) (((zend_uchar*) (A))[4])) << 24)) +\
-
(((uint64_t) (((uint32_t) (((zend_uchar*) (A))[3])) +\
-
(((uint32_t) (((zend_uchar*) (A))[2])) << 8) +\
-
(((uint32_t) (((zend_uchar*) (A))[1])) << 16) +\
-
(((uint32_t) (((zend_uchar*) (A))[0])) << 24))) << 32))
-
#define uint8korr(A) ((uint64_t)(((uint32_t) ((zend_uchar) (A)[0])) +\
(((uint32_t) ((zend_uchar) (A)[1])) << 8) +\
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-01-14 10:32:05 UTC
(rev 293536)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-01-14 10:35:28 UTC
(rev 293537)
@@ -369,16 +369,6 @@
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
(((uint32_t) ((zend_uchar) (A)[3])) << 24))
-
-#define bit_uint8korr(A) ((uint64_t)(((uint32_t) (((zend_uchar*) (A))[7])) +\
-
(((uint32_t) (((zend_uchar*) (A))[6])) << 8) +\
-
(((uint32_t) (((zend_uchar*) (A))[5])) << 16) +\
-
(((uint32_t) (((zend_uchar*) (A))[4])) << 24)) +\
-
(((uint64_t) (((uint32_t) (((zend_uchar*) (A))[3])) +\
-
(((uint32_t) (((zend_uchar*) (A))[2])) << 8) +\
-
(((uint32_t) (((zend_uchar*) (A))[1])) << 16) +\
-
(((uint32_t) (((zend_uchar*) (A))[0])) << 24))) << 32))
-
#define uint8korr(A) ((uint64_t)(((uint32_t) ((zend_uchar) (A)[0])) +\
(((uint32_t) ((zend_uchar) (A)[1])) << 8) +\
(((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
