diff options
| author | Andrey Hristov <andrey@php.net> | 2007-08-03 16:32:27 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2007-08-03 16:32:27 +0000 |
| commit | 7186530157850f812293474f2bb5c37af94d6e6c (patch) | |
| tree | 3b521aab5920faf623ae44e56d42e9b00bd8f05d /ext/mysqlnd/mysqlnd_portability.h | |
| parent | 77701c003a0afa77a8f76bb0a94a7989f8529848 (diff) | |
| download | php-git-7186530157850f812293474f2bb5c37af94d6e6c.tar.gz | |
Update CVS
- Fix BIT problem for BIT values represented with 5 bytes. Typo.
- Make it possible with an ini variable to switch off/on statistics
collection.
- Compile-out debug checking of uneaten data from the line, when the
build is release. According to callgrind this was eating some percentage.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_portability.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_portability.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index 42e47897b2..37aeb67e21 100644 --- a/ext/mysqlnd/mysqlnd_portability.h +++ b/ext/mysqlnd/mysqlnd_portability.h @@ -153,11 +153,11 @@ typedef long longlong; (((uint32) (((uchar*) (A))[1])) << 16) +\ (((uint32) (((uchar*) (A))[0])) << 24))) -#define bit_uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ - (((uint32) ((uchar) (A)[1])) << 8) +\ +#define bit_uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[4])) +\ + (((uint32) ((uchar) (A)[3])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16) +\ - (((uint32) ((uchar) (A)[3])) << 24)) +\ - (((ulonglong) ((uchar) (A)[4])) << 32)) + (((uint32) ((uchar) (A)[1])) << 24)) +\ + (((ulonglong) ((uchar) (A)[0])) << 32)) #define bit_uint6korr(A) ((ulonglong)(((uint32) (((uchar*) (A))[5])) +\ (((uint32) (((uchar*) (A))[4])) << 8) +\ |