diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 16:42:03 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 16:42:03 +0200 |
| commit | 1b72f3618b901f017fc4f5db5dbaad72ca79243a (patch) | |
| tree | 0e45a04dc98f31226612beac168f784f63ca4c10 | |
| parent | ea65c36c19225f91a686c4cc33b1fe1527f1e785 (diff) | |
| download | mariadb-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
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/type_traits.hpp | 6 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 94bc85557df..9b2bc65cf3c 100644 --- a/configure.in +++ b/configure.in @@ -1082,7 +1082,7 @@ case $SYSTEM_TYPE in *darwin6*) if test "$ac_cv_prog_gcc" = "yes" then - FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH" + FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DDONT_DECLARE_CXA_PURE_VIRTUAL " CFLAGS="$CFLAGS $FLAGS" CXXFLAGS="$CXXFLAGS $FLAGS" MAX_C_OPTIMIZE="-O" diff --git a/extra/yassl/taocrypt/include/type_traits.hpp b/extra/yassl/taocrypt/include/type_traits.hpp index b985358e1c1..3a50f9ba8f3 100644 --- a/extra/yassl/taocrypt/include/type_traits.hpp +++ b/extra/yassl/taocrypt/include/type_traits.hpp @@ -69,7 +69,11 @@ MK_FUNDAMENTAL_TYPE(unsigned long) MK_FUNDAMENTAL_TYPE(float) MK_FUNDAMENTAL_TYPE( double) -MK_FUNDAMENTAL_TYPE(long double) + +#ifdef LONG_DOUBLE_IS_DISTINCT_TYPE +// Don't define by default as this gives warnings on power mac + MK_FUNDAMENTAL_TYPE(long double) +#endif #if defined(WORD64_AVAILABLE) && defined(WORD64_IS_DISTINCT_TYPE) MK_FUNDAMENTAL_TYPE(word64) 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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 15580f944a4..7a19e26a8b7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -900,7 +900,7 @@ void kill_mysql(void) { DBUG_ENTER("kill_mysql"); -#ifdef SIGNALS_DONT_BREAK_READ +#if defined(SIGNALS_DONT_BREAK_READ) && !defined(EMBEDDED_LIBRARY) abort_loop=1; // Break connection loops close_server_sock(); // Force accept to wake up #endif |