diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
| commit | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (patch) | |
| tree | 1fb25244a6b004ddafb31844314b374fe38adf33 /include/my_alloc.h | |
| parent | a8c288054efb4de42cefa5bf06bcb487171ed9d3 (diff) | |
| download | mariadb-git-60a9d9bbb94ac03159bcc2d75b649abb1c9dc956.tar.gz | |
Post-merge fix: header is used by the client API. Obvious in retrospect.
Also, update a few cases missed by the initial patch.
client/mysqltest.cc:
Remove trailing comma.
include/my_alloc.h:
Do not use wrapper.
include/mysql.h.pp:
Update ABI file.
plugin/semisync/semisync_master.h:
Initialize variable.
sql/debug_sync.cc:
Use C linkage.
Diffstat (limited to 'include/my_alloc.h')
| -rw-r--r-- | include/my_alloc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h index dbf104bda9a..4b1ffd3d444 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -23,7 +23,9 @@ #define ALLOC_MAX_BLOCK_TO_DROP 4096 #define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10 -C_MODE_START +#ifdef __cplusplus +extern "C" { +#endif typedef struct st_used_mem { /* struct for once_alloc (block) */ @@ -51,6 +53,8 @@ typedef struct st_mem_root void (*error_handler)(void); } MEM_ROOT; -C_MODE_END +#ifdef __cplusplus +} +#endif #endif |