From 56e4fc4b00607391216bfd7ad1ef6612dd6e0e9b Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sat, 5 Dec 2009 04:14:48 +0100 Subject: Fix my_atomic.h on Solaris, do not redefine macros already defined in include/atomic/solaris.h --- include/my_atomic.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/my_atomic.h') diff --git a/include/my_atomic.h b/include/my_atomic.h index 85cf87165fb..95868e4b810 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -69,6 +69,7 @@ #include "atomic/nolock.h" #endif +#ifndef MY_ATOMICS_MADE #ifndef make_atomic_cas_body /* nolock.h was not able to generate even a CAS function, fall back */ #include "atomic/rwlock.h" @@ -277,6 +278,7 @@ make_atomic_store(ptr) #undef make_atomic_load_body #undef make_atomic_store_body #undef make_atomic_fas_body +#endif /* MY_ATOMICS_MADE */ #undef intptr /* -- cgit v1.2.1 From 9cabc9fd8ac4d249d95ff7140371533070dedd4e Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 28 Jan 2010 11:09:05 +0100 Subject: prettification of package names and fix compile bug on OSX/ppc --- include/my_atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/my_atomic.h') diff --git a/include/my_atomic.h b/include/my_atomic.h index b506aa7d3d1..9914fd2428f 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -105,7 +105,7 @@ warning: 'transparent_union' attribute ignored */ #if defined(__GNUC__) && !defined(__cplusplus) && \ - ! (defined(__APPLE__) && defined(_ARCH_PPC64)) + ! (defined(__APPLE__) && (defined(_ARCH_PPC64) ||defined (_ARCH_PPC))) /* we want to be able to use my_atomic_xxx functions with both signed and unsigned integers. But gcc will issue a warning -- cgit v1.2.1