diff options
| author | Rickard Green <[email protected]> | 2014-12-10 13:12:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-12-10 13:12:11 +0100 |
| commit | d306a3a99907adbdd5419090df2781c2773acf1b (patch) | |
| tree | 2241640c5cca1d92625df034110c11301dd681f1 /erts/emulator/beam/erl_process.h | |
| parent | 3ed99869e4b3896f2d1d2ea56208bba4537129a8 (diff) | |
| parent | 1ee58f610fa2080ea616231f5c01d6339639ceb9 (diff) | |
| download | otp-d306a3a99907adbdd5419090df2781c2773acf1b.tar.gz otp-d306a3a99907adbdd5419090df2781c2773acf1b.tar.bz2 otp-d306a3a99907adbdd5419090df2781c2773acf1b.zip | |
Merge branch 'maint'
* maint:
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 3d08be25ff..55009ad904 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -352,13 +352,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 { |