Commit d1b7eda5 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/ram/work/4.1
parents cdbf4939 f547b03e

include/my_global.h

+0 −12
Original line number Diff line number Diff line
@@ -214,18 +214,6 @@ C_MODE_START int __cxa_pure_virtual() {\ 
#define BAD_MEMCPY

#endif



/* In Linux-alpha we have atomic.h if we are using gcc */

#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 &&  __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)

#define HAVE_ATOMIC_ADD

#define HAVE_ATOMIC_SUB

#endif



/* In Linux-ia64 including atomic.h will give us an error */

#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)

#undef HAVE_ATOMIC_ADD

#undef HAVE_ATOMIC_SUB

#endif



#if defined(_lint) && !defined(lint)

#define lint

#endif