diff options
| author | Björn Gustavsson <[email protected]> | 2011-05-13 14:22:29 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-05-13 14:22:29 +0200 |
| commit | 926795501b71ebf9ca4b22927021fa551549f9b0 (patch) | |
| tree | c0ae4a4a483a858c0d26dbd763752ef7b038f71d /erts/emulator/beam/erl_process.c | |
| parent | e008b6385d038196f7d2c9db98339e311e48fa88 (diff) | |
| parent | 54b677e80cdd1da685c69d349ca83e68dce5b991 (diff) | |
| download | otp-926795501b71ebf9ca4b22927021fa551549f9b0.tar.gz otp-926795501b71ebf9ca4b22927021fa551549f9b0.tar.bz2 otp-926795501b71ebf9ca4b22927021fa551549f9b0.zip | |
Merge branch 'bjorn/fix-warnings/OTP-9250' into dev
* bjorn/fix-warnings/OTP-9250:
Eliminate alias warning in gcc 4.5.2
erl_trace: Eliminate alias warning
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 8a56976905..05172aaefa 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -7637,7 +7637,8 @@ continue_exit_process(Process *p static void timeout_proc(Process* p) { - p->i = *((BeamInstr **) (UWord) p->def_arg_reg); + BeamInstr** pi = (BeamInstr **) p->def_arg_reg; + p->i = *pi; p->flags |= F_TIMO; p->flags &= ~F_INSLPQUEUE; |