diff options
| author | unknown <serg@serg.mylan> | 2006-06-29 15:39:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-06-29 15:39:53 +0200 |
| commit | 948caab031ac765d74e36b0dad2452cee1a05e74 (patch) | |
| tree | 6caa01d28f4377fb975fe7fcfb08fd25f8c8437e /include/atomic/nolock.h | |
| parent | db98fc9450255d881e2783eb2190029bb164d881 (diff) | |
| download | mariadb-git-948caab031ac765d74e36b0dad2452cee1a05e74.tar.gz | |
support for xadd emulation, workaround for Darwin
include/atomic/nolock.h:
support for xadd emulation
include/atomic/x86-msvc.h:
syntax error
include/my_atomic.h:
support for xadd emulation, cleanup
mysys/my_atomic.c:
assert
Diffstat (limited to 'include/atomic/nolock.h')
| -rw-r--r-- | include/atomic/nolock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h index 458cb3e4f66..1151a334b06 100644 --- a/include/atomic/nolock.h +++ b/include/atomic/nolock.h @@ -15,11 +15,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #if defined(__i386__) || defined(_M_IX86) + #ifdef MY_ATOMIC_MODE_DUMMY # define LOCK "" #else -# define LOCK "lock " +# define LOCK "lock" #endif + #ifdef __GNUC__ #include "x86-gcc.h" #elif defined(_MSC_VER) @@ -27,7 +29,7 @@ #endif #endif -#ifdef make_atomic_add_body +#ifdef make_atomic_cas_body typedef struct { } my_atomic_rwlock_t; #define my_atomic_rwlock_destroy(name) |