added 1 changeset to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: 42eafd7e57e28531ce1055f93eb2a6588c4435b1 new head: a996bce5a0b98a1c11c3e7d5bbffdf4eb1298eba ---------------------------------------------------------------------------- a996bce: Fix header includes. Some cleanup. * include target_SupportDefs.h, not SupportDefs.h * Add the missing underscore in the type names. * Remove commented includes [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- Commit: a996bce5a0b98a1c11c3e7d5bbffdf4eb1298eba Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Thu Aug 2 17:34:21 2012 UTC ---------------------------------------------------------------------------- 1 file changed, 37 insertions(+), 42 deletions(-) src/build/libroot/atomic.cpp | 79 ++++++++++++++++++-------------------- ---------------------------------------------------------------------------- diff --git a/src/build/libroot/atomic.cpp b/src/build/libroot/atomic.cpp index 7c3daaa..0c5ea3c 100644 --- a/src/build/libroot/atomic.cpp +++ b/src/build/libroot/atomic.cpp @@ -1,109 +1,104 @@ -//#include <BeOSBuildCompatibility.h> +#include <target_SupportDefs.h> -//#include <string.h> -//#include <OS.h> -#include <SupportDefs.h> - - -haiku_build_int32 -_haiku_build_atomic_set(haiku_build_vint32 *value, haiku_build_int32 newValue) +_haiku_build_int32 +_haiku_build_atomic_set(_haiku_build_vint32 *value, _haiku_build_int32 newValue) { - haiku_build_int32 oldValue = *value; + _haiku_build_int32 oldValue = *value; *value = newValue; return oldValue; } -haiku_build_int32 -_haiku_build_atomic_test_and_set(haiku_build_vint32 *value, - haiku_build_int32 newValue, haiku_build_int32 testAgainst) +_haiku_build_int32 +_haiku_build_atomic_test_and_set(_haiku_build_vint32 *value, + _haiku_build_int32 newValue, _haiku_build_int32 testAgainst) { - haiku_build_int32 oldValue = *value; + _haiku_build_int32 oldValue = *value; if (oldValue == testAgainst) *value = newValue; return oldValue; } -haiku_build_int32 -_haiku_build_atomic_add(haiku_build_vint32 *value, haiku_build_int32 addValue) +_haiku_build_int32 +_haiku_build_atomic_add(_haiku_build_vint32 *value, _haiku_build_int32 addValue) { - haiku_build_int32 oldValue = *value; + _haiku_build_int32 oldValue = *value; *value += addValue; return oldValue; } -haiku_build_int32 -_haiku_build_atomic_and(haiku_build_vint32 *value, haiku_build_int32 andValue) +_haiku_build_int32 +_haiku_build_atomic_and(_haiku_build_vint32 *value, _haiku_build_int32 andValue) { - haiku_build_int32 oldValue = *value; + _haiku_build_int32 oldValue = *value; *value &= andValue; return oldValue; } -haiku_build_int32 -_haiku_build_atomic_or(haiku_build_vint32 *value, haiku_build_int32 orValue) +_haiku_build_int32 +_haiku_build_atomic_or(_haiku_build_vint32 *value, _haiku_build_int32 orValue) { - haiku_build_int32 oldValue = *value; + _haiku_build_int32 oldValue = *value; *value |= orValue; return oldValue; } -haiku_build_int32 -_haiku_build_atomic_get(haiku_build_vint32 *value) +_haiku_build_int32 +_haiku_build_atomic_get(_haiku_build_vint32 *value) { return *value; } -haiku_build_int64 -_haiku_build_atomic_set64(haiku_build_vint64 *value, haiku_build_int64 newValue) +_haiku_build_int64 +_haiku_build_atomic_set64(_haiku_build_vint64 *value, _haiku_build_int64 newValue) { - haiku_build_int64 oldValue = *value; + _haiku_build_int64 oldValue = *value; *value = newValue; return oldValue; } -haiku_build_int64 -_haiku_build_atomic_test_and_set64(haiku_build_vint64 *value, - haiku_build_int64 newValue, haiku_build_int64 testAgainst) +_haiku_build_int64 +_haiku_build_atomic_test_and_set64(_haiku_build_vint64 *value, + _haiku_build_int64 newValue, _haiku_build_int64 testAgainst) { - haiku_build_int64 oldValue = *value; + _haiku_build_int64 oldValue = *value; if (oldValue == testAgainst) *value = newValue; return oldValue; } -haiku_build_int64 -_haiku_build_atomic_add64(haiku_build_vint64 *value, haiku_build_int64 addValue) +_haiku_build_int64 +_haiku_build_atomic_add64(_haiku_build_vint64 *value, _haiku_build_int64 addValue) { - haiku_build_int64 oldValue = *value; + _haiku_build_int64 oldValue = *value; *value += addValue; return oldValue; } -haiku_build_int64 -_haiku_build_atomic_and64(haiku_build_vint64 *value, haiku_build_int64 andValue) +_haiku_build_int64 +_haiku_build_atomic_and64(_haiku_build_vint64 *value, _haiku_build_int64 andValue) { - haiku_build_int64 oldValue = *value; + _haiku_build_int64 oldValue = *value; *value &= andValue; return oldValue; } -haiku_build_int64 -_haiku_build_atomic_or64(haiku_build_vint64 *value, haiku_build_int64 orValue) +_haiku_build_int64 +_haiku_build_atomic_or64(_haiku_build_vint64 *value, _haiku_build_int64 orValue) { - haiku_build_int64 oldValue = *value; + _haiku_build_int64 oldValue = *value; *value |= orValue; return oldValue; } -haiku_build_int64 -_haiku_build_atomic_get64(haiku_build_vint64 *value) +_haiku_build_int64 +_haiku_build_atomic_get64(_haiku_build_vint64 *value) { return *value; }