summaryrefslogtreecommitdiff
path: root/include/my_atomic.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-11-25 18:17:28 +0100
committerSergei Golubchik <sergii@pisem.net>2010-11-25 18:17:28 +0100
commit65ca700def99289cc31a7040537f5aa6e12bf485 (patch)
tree97b3a07299b626c519da0e80c122b5b79b933914 /include/my_atomic.h
parent2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff)
parent6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff)
downloadmariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz
merge.
checkpoint. does not compile.
Diffstat (limited to 'include/my_atomic.h')
-rw-r--r--include/my_atomic.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h
index c2d514012d9..48bbe8c2946 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -1,6 +1,3 @@
-#ifndef MY_ATOMIC_INCLUDED
-#define MY_ATOMIC_INCLUDED
-
/* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -28,10 +25,9 @@
store 'what' in *var, and return the old value of *var
my_atomic_cas#(&var, &old, new)
- An odd variation of 'Compare And Set/Swap'
+ 'Compare And Swap'
if *var is equal to *old, then store 'new' in *var, and return TRUE
otherwise store *var in *old, and return FALSE
- Usually, &old should not be accessed if the operation is successful.
my_atomic_load#(&var)
return *var