diff --git a/h/missing_proto.h b/h/missing_proto.h index 3294d989f..fc01704c5 100644 --- a/h/missing_proto.h +++ b/h/missing_proto.h @@ -3,7 +3,7 @@ #ifdef NOSBRK void *sbrk(__intptr_t increment); -int brk(void * addr); +void *brk(void * addr); #endif #ifdef NOMKTEMP @@ -12,7 +12,7 @@ char *mktemp(char *template); #ifdef EMULATE_BRK void *sbrk_emu(int increment); -int brk_emu(void * addr); +void *brk_emu(const void * addr); #ifdef sbrk #undef sbrk diff --git a/modules/src/sbrk/sbrk_emu.c b/modules/src/sbrk/sbrk_emu.c index f70d1fc36..d8a1947d4 100644 --- a/modules/src/sbrk/sbrk_emu.c +++ b/modules/src/sbrk/sbrk_emu.c @@ -27,14 +27,14 @@ extern char *calloc(); static void *bottom = NULL; /* bottom of calloc()ed pseudo-heap */ static void *brkval = NULL; /* current value of simulated break */ -int brk_emu( void *endds ) +void *brk_emu(const void *endds ) { int offset; if ( bottom == NULL ) { if ( (bottom = calloc( HEAP_SIZE, 1 )) == 0 ) { - return BRK_ERR; /* unable to set up pseudo-heap */ + return (void *)BRK_ERR; /* unable to set up pseudo-heap */ } else { @@ -45,12 +45,12 @@ int brk_emu( void *endds ) if ( (offset = endds - bottom) < 0 || offset > HEAP_SIZE ) { errno = ENOMEM; - return BRK_ERR; /* attempt to set break out of heap */ + return (void *)BRK_ERR; /* attempt to set break out of heap */ } else { - brkval = endds; - return BRK_OK; + brkval = (void *)endds; + return (void *)BRK_OK; } }