diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 13:02:57 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 13:02:57 +0200 |
| commit | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (patch) | |
| tree | a5373ac33cc100031b219da1e424961b585d3947 /include | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-222e128b34e7cfa67270a03c3d690d81dc0bc17b.tar.gz | |
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index d53dee23e17..23fe71caa8d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1078,7 +1078,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ */ #define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF) #endif -#define uint4korr(A) (*((unsigned long *) (A))) +#define uint4korr(A) (*((uint32 *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16) +\ |