summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-01-23 16:42:03 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-01-23 16:42:03 +0200
commit1b72f3618b901f017fc4f5db5dbaad72ca79243a (patch)
tree0e45a04dc98f31226612beac168f784f63ca4c10 /include
parentea65c36c19225f91a686c4cc33b1fe1527f1e785 (diff)
downloadmariadb-git-1b72f3618b901f017fc4f5db5dbaad72ca79243a.tar.gz
Avoid compiler warnings on powermacg5
Fixed compilation error when trying to compile libmysqld on powermac configure.in: Added flag if __cxa_pure_virtual() should be defined. Without this flag, we get a warning from my_global.h for every compiled file on powermacg5 extra/yassl/taocrypt/include/type_traits.hpp: Avoid compiler warning include/my_global.h: Avoid compiler warning on powermacg5 sql/mysqld.cc: Fix compiler error when compiling embedded on powermac
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b91ff8a9e5b..d53dee23e17 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -540,7 +540,7 @@ typedef unsigned short ushort;
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
weak symbol.
*/
-#ifdef USE_MYSYS_NEW
+#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL)
C_MODE_START
int __cxa_pure_virtual () __attribute__ ((weak));
C_MODE_END