diff options
author | Björn Gustavsson <[email protected]> | 2010-09-07 10:27:14 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2010-09-07 10:27:14 +0200 |
commit | 03997d5a1c166e8470dd9c888a5dba121144986a (patch) | |
tree | 76ef98d2fc2cf0588392b036be18d984072207c1 /erts/emulator/sys/common | |
parent | 4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d (diff) | |
parent | 88a04a19d751c4c6712fc9b079e16d3976a4d731 (diff) | |
download | otp-03997d5a1c166e8470dd9c888a5dba121144986a.tar.gz otp-03997d5a1c166e8470dd9c888a5dba121144986a.tar.bz2 otp-03997d5a1c166e8470dd9c888a5dba121144986a.zip |
Merge branch 'mk/net-dragonfly-bsd-patches' into dev
* mk/net-dragonfly-bsd-patches:
Remove unused variables
Use proper install method
Add support for DragonFly BSD
Add support for NetBSD
Diffstat (limited to 'erts/emulator/sys/common')
-rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index 1c4c37b01a..b1ee165489 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -382,6 +382,14 @@ mseg_recreate(void *old_seg, Uint old_size, Uint new_size) new_seg = (void *) pmremap((void *) old_seg, (size_t) old_size, (size_t) new_size); +#elif defined(__NetBSD__) + new_seg = (void *) mremap((void *) old_seg, + (size_t) old_size, + NULL, + (size_t) new_size, + 0); + if (new_seg == (void *) MAP_FAILED) + new_seg = NULL; #else new_seg = (void *) mremap((void *) old_seg, (size_t) old_size, |