Merge branch 'maint'

Conflicts:
	erts/preloaded/ebin/erl_prim_loader.beam
	lib/kernel/src/code.erl

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/kernel/examples/uds_dist/c_src/uds_drv.c b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
index 9327ab19dc..9ad6b85a0f 100644
--- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c
+++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
@@ -967,7 +967,7 @@ static void *my_malloc(size_t size)
     void *ptr;
 
     if ((ptr = driver_alloc(size)) == NULL) {
-	erl_exit(1,"Could not allocate %d bytes of memory",(int) size);
+	erl_exit(1,"Could not allocate %lu bytes of memory",(unsigned long) size);
     }
     return ptr;
 }
@@ -977,7 +977,7 @@ static void *my_realloc(void *ptr, size_t size)
     void erl_exit(int, char *, ...);
     void *nptr;
     if ((nptr = driver_realloc(ptr, size)) == NULL) {
-	erl_exit(1,"Could not reallocate %d bytes of memory",(int) size);
+	erl_exit(1,"Could not reallocate %lu bytes of memory",(unsigned long) size);
     }
     return nptr;
 }