1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-10725 Server 10.1.17 fails to build using clang with c++11

Browse Source 
my_offsetof() returns a difference of two pointers, it must use the
appropriate return type (my_ptrdiff_t, not size_t)
This commit is contained in:
Sergei Golubchik 2016-09-24 01:17:35 +02:00
parent 9434431374
commit f620da194b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_global.h
View File

@ -857,8 +857,7 @@ typedef long long my_ptrdiff_t;
and related routines are refactored. and related routines are refactored.
*/ */
#define my_offsetof(TYPE, MEMBER) \ #define my_offsetof(TYPE, MEMBER) PTR_BYTE_DIFF(&((TYPE *)0x10)->MEMBER, 0x10)
((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
#define NullS (char *) 0 #define NullS (char *) 0

6
sql/parse_file.h
View File

@ -42,9 +42,9 @@ enum file_opt_type {
struct File_option struct File_option
{ {
LEX_STRING name; /**< Name of the option */ LEX_STRING name; /**< Name of the option */
int offset; /**< offset to base address of value */ my_ptrdiff_t offset; /**< offset to base address of value */
file_opt_type type; /**< Option type */ file_opt_type type; /**< Option type */
}; };