diff options
| author | Lukas Larsson <[email protected]> | 2012-10-09 14:48:26 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-10-09 14:48:26 +0200 |
| commit | 47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5 (patch) | |
| tree | 71d02171e9d3a95dcb8b9f6babdec8ea2730d1f7 /erts/emulator | |
| parent | a617af92131c6a53b45e2ed4c10412e2770fdb3b (diff) | |
| parent | f667680342e7fba3b5c8316f73a872147d502e01 (diff) | |
| download | otp-47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5.tar.gz otp-47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5.tar.bz2 otp-47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5.zip | |
Merge branch 'maint'
* maint:
Add comment about eproviderfailedinit error
Increase sbct for win64 as block alignment is 16
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_posix_str.c | 1 | ||||
| -rw-r--r-- | erts/emulator/test/alloc_SUITE_data/bucket_mask.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_posix_str.c b/erts/emulator/beam/erl_posix_str.c index 02db10905b..deb7e3e173 100644 --- a/erts/emulator/beam/erl_posix_str.c +++ b/erts/emulator/beam/erl_posix_str.c @@ -619,6 +619,7 @@ erl_errno_id(error) case WSAEINVALIDPROVIDER: return "einvalidprovider"; #endif #ifdef WSAEPROVIDERFAILEDINIT + /* You could get this if SYSTEMROOT env variable is set incorrectly */ case WSAEPROVIDERFAILEDINIT: return "eproviderfailedinit"; #endif #ifdef WSASYSCALLFAILURE diff --git a/erts/emulator/test/alloc_SUITE_data/bucket_mask.c b/erts/emulator/test/alloc_SUITE_data/bucket_mask.c index 13af7d861a..b214f87e4a 100644 --- a/erts/emulator/test/alloc_SUITE_data/bucket_mask.c +++ b/erts/emulator/test/alloc_SUITE_data/bucket_mask.c @@ -16,11 +16,19 @@ * $Id$ */ +#include "erl_int_sizes_config.h" + #include "testcase_driver.h" #include "allocator_test.h" #include <stdio.h> -#define SBCT (512*1024) +#ifdef __WIN32__ && SIZEOF_VOID_P == 8 +/* Use larger threashold for win64 as block alignment + is 16 bytes and not 8 */ +#define SBCT ((1024*1024)) +#else +#define SBCT ((512*1024)) +#endif char * testcase_name(void) |