diff options
| author | unknown <guilhem@mysql.com> | 2004-11-16 00:04:12 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-16 00:04:12 +0100 |
| commit | 445c9103a345c560d15beec8c7ad4c944c3b1d2c (patch) | |
| tree | 4b3acfdee8480e9e03666d068ee6a08eed12672b /include | |
| parent | 6763a1da76a07c3962492acae491c341714f8b82 (diff) | |
| parent | fa68d58087f0439fe9289ea3da830017a2ce5769 (diff) | |
| download | mariadb-git-445c9103a345c560d15beec8c7ad4c944c3b1d2c.tar.gz | |
Merge
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 369ba838698..3c0266d2e71 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -194,10 +194,10 @@ C_MODE_END /* Fix problem when linking c++ programs with gcc 3.x */ #ifdef DEFINE_CXA_PURE_VIRTUAL #define FIX_GCC_LINKING_PROBLEM \ -extern "C" { int __cxa_pure_virtual() {\ +C_MODE_START int __cxa_pure_virtual() {\ DBUG_ASSERT("Pure virtual method called." == "Aborted");\ return 0;\ -} } +} C_MODE_END #else #define FIX_GCC_LINKING_PROBLEM #endif |