diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-18 22:38:22 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-18 22:38:22 +0100 |
| commit | e906ffcf9c951c8539700487e2bcc62e1c064dc7 (patch) | |
| tree | fce7aac4178cc46c835db1c068b69edadda1b5c2 /storage/myisam/myisamdef.h | |
| parent | 2813f568b74a65d5d2ce8bbcada2c99d1a01815a (diff) | |
| download | mariadb-git-e906ffcf9c951c8539700487e2bcc62e1c064dc7.tar.gz | |
Linker error, missing extern "C" for mi_killed.
Fix is to move extern "C" at the start of header file.
Diffstat (limited to 'storage/myisam/myisamdef.h')
| -rw-r--r-- | storage/myisam/myisamdef.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index cde46e9dd96..92e845bcb51 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -25,6 +25,10 @@ #include <my_no_pthread.h> #endif +#ifdef __cplusplus +extern "C" { +#endif + #if defined(my_write) && !defined(MAP_TO_USE_RAID) /* undef map from my_nosys; We need test-if-disk full */ #undef my_write @@ -655,9 +659,7 @@ enum myisam_log_commands #define fast_mi_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _mi_writeinfo((INFO),0) #define fast_mi_readinfo(INFO) ((INFO)->lock_type == F_UNLCK) && _mi_readinfo((INFO),F_RDLCK,1) -#ifdef __cplusplus -extern "C" { -#endif + extern uint _mi_get_block_info(MI_BLOCK_INFO *, File, my_off_t); extern uint _mi_rec_pack(MI_INFO *info, uchar *to, const uchar *from); extern uint _mi_pack_get_block_info(MI_INFO *myisam, MI_BIT_BUFF *bit_buff, |