diff options
| author | Henrik Nord <[email protected]> | 2012-07-18 11:26:09 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-18 11:26:09 +0200 |
| commit | 9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390 (patch) | |
| tree | ef6344901bc1f7c505eab25c3f85840b6229beba /erts/emulator/drivers | |
| parent | 0ccc6e476e261b5057ed8d74204c6b52cbdd2605 (diff) | |
| parent | 95bf75bc27c07bc6a5054fb762cd07335d64b642 (diff) | |
| download | otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.gz otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.tar.bz2 otp-9b13eaca6cf8a72b95a74a882dd6cb13a8aa2390.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
lib/kernel/src/code.erl
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/drivers/unix/unix_efile.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index 603d1d47b6..347247ee7b 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -522,7 +522,7 @@ static void *ef_safe_alloc(Uint s) static void *ef_safe_realloc(void *op, Uint s) { void *p = EF_REALLOC(op, s); - if (!p) erl_exit(1, "efile drv: Can't reallocate %d bytes of memory\n", s); + if (!p) erl_exit(1, "efile drv: Can't reallocate %lu bytes of memory\n", (unsigned long)s); return p; } diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index ad112f7590..b250bac4dc 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -107,8 +107,8 @@ static void *ef_safe_alloc(Uint s) { void *p = EF_ALLOC(s); if (!p) erl_exit(1, - "unix efile drv: Can't allocate %d bytes of memory\n", - s); + "unix efile drv: Can't allocate %lu bytes of memory\n", + (unsigned long)s); return p; } @@ -118,8 +118,8 @@ static void *ef_safe_realloc(void *op, Uint s) { void *p = EF_REALLOC(op, s); if (!p) erl_exit(1, - "unix efile drv: Can't reallocate %d bytes of memory\n", - s); + "unix efile drv: Can't reallocate %lu bytes of memory\n", + (unsigned long)s); return p; } |