From 6fdcac1bc2cd78acdc62d0e3a2905bf8ec22b0c8 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 23 Nov 2009 17:06:03 -0800 Subject: * lib.c (chk_malloc, chk_realloc): Fix diagnosable conversion, caught by gcc 4.1.1. --- ChangeLog | 5 +++++ lib.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cee0f2a..e206875a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-23 Kaz Kylheku + + * lib.c (chk_malloc, chk_realloc): Fix diagnosable conversion, + caught by gcc 4.1.1. + 2009-11-23 Kaz Kylheku * configure (cross): Print out value of $cross in --help. diff --git a/lib.c b/lib.c index 55913d70..eb612f42 100644 --- a/lib.c +++ b/lib.c @@ -529,7 +529,7 @@ static val equal_tramp(val env, val left, val right) unsigned char *chk_malloc(size_t size) { - char *ptr = malloc(size); + unsigned char *ptr = malloc(size); if (size && ptr == 0) ptr = oom_realloc(0, size); return ptr; @@ -537,7 +537,7 @@ unsigned char *chk_malloc(size_t size) unsigned char *chk_realloc(void *old, size_t size) { - char *newptr = realloc(old, size); + unsigned char *newptr = realloc(old, size); if (size != 0 && newptr == 0) newptr = oom_realloc(old, size); return newptr; -- cgit v1.2.3