From 917427f3b759355080a97e8c3f2f9936c4a879e1 Mon Sep 17 00:00:00 2001 From: "joreland@mysql.com" <> Date: Tue, 4 May 2004 12:40:33 +0200 Subject: [PATCH] yangf - yet another ndb gcc/g++ fix Hopefully last one --- ndb/config/Defs.LINUX.x86.GCC.mk | 2 +- ndb/src/common/portlib/gcc.cpp | 7 +++++++ ndb/src/common/util/new.cpp | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 ndb/src/common/portlib/gcc.cpp diff --git a/ndb/config/Defs.LINUX.x86.GCC.mk b/ndb/config/Defs.LINUX.x86.GCC.mk index e1bed3a8ca9..698b0eb8350 100644 --- a/ndb/config/Defs.LINUX.x86.GCC.mk +++ b/ndb/config/Defs.LINUX.x86.GCC.mk @@ -53,4 +53,4 @@ LINK.cc = $(PURE) $(CC) $(CCFLAGS) $(LDFLAGS) LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -LDFLAGS_LAST = -lpthread -lrt +LDFLAGS_LAST = -lpthread -lrt $(NDB_TOP)/src/common/portlib/gcc.cpp diff --git a/ndb/src/common/portlib/gcc.cpp b/ndb/src/common/portlib/gcc.cpp new file mode 100644 index 00000000000..41b1373ee78 --- /dev/null +++ b/ndb/src/common/portlib/gcc.cpp @@ -0,0 +1,7 @@ + +/** + * GCC linking problem... + */ +#if ( __GNUC__ == 3 ) +extern "C" { int __cxa_pure_virtual() { return 0;} } +#endif diff --git a/ndb/src/common/util/new.cpp b/ndb/src/common/util/new.cpp index aff7a0e3986..a0709a3fa13 100644 --- a/ndb/src/common/util/new.cpp +++ b/ndb/src/common/util/new.cpp @@ -37,10 +37,3 @@ void operator delete[] (void *ptr) throw () if (ptr) free(ptr); } - -/** - * GCC linking problem... - */ -#if ( __GNUC__ == 3 ) -extern "C" { int __cxa_pure_virtual() {return 0;} } -#endif -- 2.30.9