diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
| commit | a98c85bb501e9021c0d8d509b8c040611d4c0c3a (patch) | |
| tree | 61dc69fc1cbf886aee6c2934e8efc6b57c3462bb /include | |
| parent | c18054deb2b5cfcf1f13aa71574406f2bafb87c6 (diff) | |
| parent | 7196691b44b65e12cb5cca6f17c8d0f091eb443f (diff) | |
| download | mariadb-git-a98c85bb501e9021c0d8d509b8c040611d4c0c3a.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/byte_order_generic_x86.h | 10 | ||||
| -rw-r--r-- | include/byte_order_generic_x86_64.h | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/include/byte_order_generic_x86.h b/include/byte_order_generic_x86.h index 0a71a17829b..a97dd0f43a3 100644 --- a/include/byte_order_generic_x86.h +++ b/include/byte_order_generic_x86.h @@ -27,19 +27,9 @@ ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (*((const long *) (A))) #define uint2korr(A) (*((const uint16 *) (A))) - -/* - Attention: Please, note, uint3korr reads 4 bytes (not 3)! - It means, that you have to provide enough allocated space. -*/ -#if defined(HAVE_valgrind) && !defined(_WIN32) #define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16)) -#else -#define uint3korr(A) (long) (*((const unsigned int *) (A)) & 0xFFFFFF) -#endif - #define uint4korr(A) (*((const uint32 *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ diff --git a/include/byte_order_generic_x86_64.h b/include/byte_order_generic_x86_64.h index b6b0c5d8ea5..8c7493965a9 100644 --- a/include/byte_order_generic_x86_64.h +++ b/include/byte_order_generic_x86_64.h @@ -27,17 +27,9 @@ ((uint32) (uchar) (A)[0]))) #define sint4korr(A) (int32) (*((int32 *) (A))) #define uint2korr(A) (uint16) (*((uint16 *) (A))) -/* - Attention: Please, note, uint3korr reads 4 bytes (not 3)! - It means, that you have to provide enough allocated space. -*/ -#if defined(HAVE_valgrind) && !defined(_WIN32) #define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16)) -#else -#define uint3korr(A) (uint32) (*((unsigned int *) (A)) & 0xFFFFFF) -#endif #define uint4korr(A) (uint32) (*((uint32 *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ |