diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
| commit | 26aa385bc5278ec0ae842cf6558d8fd32b6876f1 (patch) | |
| tree | 57fb0c9c6c3686011b021c42671cf5065cdc0cf6 /include/my_global.h | |
| parent | 37cedb7efad7568b496eb981e40a0910c0e22494 (diff) | |
| parent | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (diff) | |
| download | mariadb-git-26aa385bc5278ec0ae842cf6558d8fd32b6876f1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index b91ff8a9e5b..23fe71caa8d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -540,7 +540,7 @@ typedef unsigned short ushort; duplicate declaration of __cxa_pure_virtual, solved by declaring it a weak symbol. */ -#ifdef USE_MYSYS_NEW +#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL) C_MODE_START int __cxa_pure_virtual () __attribute__ ((weak)); C_MODE_END @@ -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) +\ |