diff options
| author | Lukas Larsson <[email protected]> | 2015-07-15 11:34:13 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-02-02 10:45:21 +0100 |
| commit | c62f0216c37340e8716938b9408a40cd5b4e1d62 (patch) | |
| tree | 0a5a41fd066371666fe3747cfe8b374a008ed53e /erts/emulator/beam | |
| parent | 664ed2a6fd2b324bb6b56db3d3eca853cfda8f61 (diff) | |
| download | otp-c62f0216c37340e8716938b9408a40cd5b4e1d62.tar.gz otp-c62f0216c37340e8716938b9408a40cd5b4e1d62.tar.bz2 otp-c62f0216c37340e8716938b9408a40cd5b4e1d62.zip | |
erts: Fix msacc win32 debug compile error
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_msacc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 14b81a0a6e..4be311ae82 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1252,7 +1252,7 @@ void process_main(void) Uint64 start_time = 0; /* Monitor long schedule */ BeamInstr* start_time_i = NULL; - ERTS_MSACC_DECLARE_CACHE_X(); /* a cached value of the tsd pointer for msacc */ + ERTS_MSACC_DECLARE_CACHE_X() /* a cached value of the tsd pointer for msacc */ ERL_BITS_DECLARE_STATEP; /* Has to be last declaration */ diff --git a/erts/emulator/beam/erl_msacc.h b/erts/emulator/beam/erl_msacc.h index de72fe9597..1b4b7a408a 100644 --- a/erts/emulator/beam/erl_msacc.h +++ b/erts/emulator/beam/erl_msacc.h @@ -228,7 +228,7 @@ void erts_msacc_init_thread(char *type, int id, int liberty); #define ERTS_MSACC_IS_ENABLED() ERTS_UNLIKELY(erts_msacc_enabled) #define ERTS_MSACC_DECLARE_CACHE() \ ErtsMsAcc *ERTS_MSACC_UPDATE_CACHE(); \ - ERTS_DECLARE_DUMMY(Uint __erts_msacc_state) = ERTS_MSACC_STATE_OTHER + ERTS_DECLARE_DUMMY(Uint __erts_msacc_state) = ERTS_MSACC_STATE_OTHER; #define ERTS_MSACC_IS_ENABLED_CACHED() ERTS_UNLIKELY(__erts_msacc_cache != NULL) #define ERTS_MSACC_UPDATE_CACHE() \ __erts_msacc_cache = erts_msacc_enabled ? ERTS_MSACC_TSD_GET() : NULL |