diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:18 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-15 14:14:18 +0100 |
| commit | 676982407bf45c437de8059def8b7ce7435162cf (patch) | |
| tree | 6edc14867d105897b1065c60fbb3b00d4f061d0e /erts | |
| parent | 9e6214fb792adbe566bc0155c7050a07a531a825 (diff) | |
| parent | b5867317c9fd70497c09f7f0006a9763d024e6a8 (diff) | |
| download | otp-676982407bf45c437de8059def8b7ce7435162cf.tar.gz otp-676982407bf45c437de8059def8b7ce7435162cf.tar.bz2 otp-676982407bf45c437de8059def8b7ce7435162cf.zip | |
Merge branch 'yt/netbsd/OTP-10941' into maint
* yt/netbsd/OTP-10941:
Moved ifdef NetBSD to proper place
reduce bashism
compilation fix for NetBSD
compilation fix for NetBSD
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index aa460420d5..b6e2c9382b 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -439,7 +439,7 @@ mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size) { } #if HAVE_MSEG_RECREATE -#if defined(__NetBsd__) +#if defined(__NetBSD__) #define MREMAP_FLAGS (0) #else #define MREMAP_FLAGS (MREMAP_MAYMOVE) |