diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-14 10:57:07 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-14 10:57:07 -0400 |
| commit | 308c666b604c7a5018b3b70203bf897c2354d449 (patch) | |
| tree | 52f4bf4532acfcd20a3264361e788fc44d08d0b5 /include | |
| parent | 04f92dde67a3d4f6fcbdbf65fdb63a54ff6761d8 (diff) | |
| parent | eac8d95ffcdea7cd31d60d273e30cb3dfec66add (diff) | |
| download | mariadb-git-308c666b604c7a5018b3b70203bf897c2354d449.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.5-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index dce38a124c1..0c15478439f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -857,8 +857,7 @@ typedef long long my_ptrdiff_t; and related routines are refactored. */ -#define my_offsetof(TYPE, MEMBER) \ - ((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10)) +#define my_offsetof(TYPE, MEMBER) PTR_BYTE_DIFF(&((TYPE *)0x10)->MEMBER, 0x10) #define NullS (char *) 0 |