diff options
| author | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
| commit | d998d08c964804d9facd7b05c8429fcb8fab7f59 (patch) | |
| tree | 3a82584781b80219f0b46b02d8d6c06e4a3b1e88 /erts/emulator/beam/beam_load.c | |
| parent | bdd21517a65aa13393c8e97a89e3c9127f99c273 (diff) | |
| parent | 1b00539d6db8e349c6782bcd38ab006420734106 (diff) | |
| download | otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.gz otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.bz2 otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.zip | |
Merge branch 'lukas/erts/misc_fixes'
* lukas/erts/misc_fixes:
erts: Fix a bunch of compiler warnings
kernel: Fix gen_tcp_misc indentation
erts: Fail port_SUITE:huge_env if error code > 127
erts: Add lcnt prototype for dist locks update
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index bbccd0b79d..7331c331a6 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -5022,7 +5022,7 @@ freeze_code(LoaderState* stp) */ codev[pos] = (BeamInstr) (codev + value); } else { -#ifdef DEBUG +#if defined(DEBUG) && defined(BEAM_WIDE_MASK) Uint w; #endif Sint32 rel = lp->offset + value; |