diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-24 01:17:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-26 12:20:28 +0200 |
| commit | f620da194befe4506679ad7f1d0725796fad7de0 (patch) | |
| tree | f7892915914803a51e42691d8c018d3ff80d82f9 /sql/parse_file.h | |
| parent | 943443137460cab6499c032f0e5a03256daa9571 (diff) | |
| download | mariadb-git-f620da194befe4506679ad7f1d0725796fad7de0.tar.gz | |
MDEV-10725 Server 10.1.17 fails to build using clang with c++11
my_offsetof() returns a difference of two pointers, it must use the
appropriate return type (my_ptrdiff_t, not size_t)
Diffstat (limited to 'sql/parse_file.h')
| -rw-r--r-- | sql/parse_file.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/parse_file.h b/sql/parse_file.h index 2a0266e98b7..83a8eabcf5f 100644 --- a/sql/parse_file.h +++ b/sql/parse_file.h @@ -42,9 +42,9 @@ enum file_opt_type { struct File_option { - LEX_STRING name; /**< Name of the option */ - int offset; /**< offset to base address of value */ - file_opt_type type; /**< Option type */ + LEX_STRING name; /**< Name of the option */ + my_ptrdiff_t offset; /**< offset to base address of value */ + file_opt_type type; /**< Option type */ }; |