diff options
| author | Sverker Eriksson <[email protected]> | 2014-02-19 17:48:04 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-02-19 17:48:13 +0100 |
| commit | d7889a517476a212831f87596dd7b232eed752f8 (patch) | |
| tree | 00a4392f5e3d40ceaf32276f593b7533e298af31 /erts/emulator/beam/beam_load.c | |
| parent | 5cdba8e38d1e2043959a20739e435cc56453240b (diff) | |
| parent | f8693cf61f0555fb0108956f2d21d2234e01251d (diff) | |
| download | otp-d7889a517476a212831f87596dd7b232eed752f8.tar.gz otp-d7889a517476a212831f87596dd7b232eed752f8.tar.bz2 otp-d7889a517476a212831f87596dd7b232eed752f8.zip | |
Merge branch 'sverk/ets-all-race'
OTP-11726
* sverk/ets-all-race:
erts: Fix faulty asserts in erts_sys_aligned_alloc/free
erts: Fix harmless (?) typo in beam_load.c
erts: Fix race bug in ets:all/0
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index b589d1c930..915af7fbb1 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2013. All Rights Reserved. + * Copyright Ericsson AB 1996-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -409,7 +409,7 @@ typedef struct LoaderState { __result = __result << 8 | *Stp->file_p++; \ } \ Dest = __result; \ - } while (0) + } #define GetByte(Stp, Dest) \ if ((Stp)->file_left < 1) { \ |