Commit 1b72f361 authored by unknown's avatar unknown
Browse files

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
parent ea65c36c

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

extra/yassl/taocrypt/include/type_traits.hpp

+5 −1
Original line number Diff line number Diff line
@@ -69,7 +69,11 @@ MK_FUNDAMENTAL_TYPE(unsigned long) 


MK_FUNDAMENTAL_TYPE(float)

MK_FUNDAMENTAL_TYPE(     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)

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -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