diff options
| author | Rickard Green <[email protected]> | 2014-12-10 13:11:07 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-12-10 13:11:07 +0100 |
| commit | 1ee58f610fa2080ea616231f5c01d6339639ceb9 (patch) | |
| tree | d4f105df9554d09226d4be29c3b4de7e83654721 /erts/emulator/beam/erl_process.h | |
| parent | af87b1c3d4897840d8247589a88d3611106ecedc (diff) | |
| parent | 843cf9120d2845be2c3304fc8dcb4c16b49bbfca (diff) | |
| download | otp-1ee58f610fa2080ea616231f5c01d6339639ceb9.tar.gz otp-1ee58f610fa2080ea616231f5c01d6339639ceb9.tar.bz2 otp-1ee58f610fa2080ea616231f5c01d6339639ceb9.zip | |
Merge branch 'rickard/atomic64/OTP-12351' into maint
* rickard/atomic64/OTP-12351:
Use the new 64-bit atomic ops API
Introduce a 64-bit atomic ops API
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 27a3a3553b..f50b217d4a 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -351,13 +351,7 @@ typedef struct { #undef ERTS_HAVE_SCHED_UTIL_BALANCING_SUPPORT #define ERTS_HAVE_SCHED_UTIL_BALANCING_SUPPORT ERTS_HAVE_SCHED_UTIL_BALANCING_SUPPORT_OPT -#ifdef ARCH_64 -typedef erts_atomic_t ErtsAtomicSchedTime; -#elif defined(ARCH_32) -typedef erts_dw_atomic_t ErtsAtomicSchedTime; -#else -# error :-/ -#endif +typedef erts_atomic64_t ErtsAtomicSchedTime; #if ERTS_HAVE_SCHED_UTIL_BALANCING_SUPPORT typedef struct { |