--- ray/src/common/ealloc.c 2003/02/25 02:47:21 2.3 +++ ray/src/common/ealloc.c 2003/10/27 10:19:31 2.7 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ealloc.c,v 2.3 2003/02/25 02:47:21 greg Exp $"; +static const char RCSid[] = "$Id: ealloc.c,v 2.7 2003/10/27 10:19:31 schorsch Exp $"; #endif /* * ealloc.c - memory routines which call quit on error. @@ -11,10 +11,10 @@ static const char RCSid[] = "$Id: ealloc.c,v 2.3 2003/ #include #include +#include "rterror.h" -char * -emalloc(n) /* return pointer to n uninitialized bytes */ -unsigned int n; +extern char * /* return pointer to n uninitialized bytes */ +emalloc(unsigned int n) { register char *cp; @@ -29,10 +29,8 @@ unsigned int n; } -char * -ecalloc(ne, es) /* return pointer to initialized memory */ -register unsigned int ne; -unsigned int es; +extern char * /* return pointer to initialized memory */ +ecalloc(register unsigned int ne, unsigned int es) { register char *cp; @@ -51,14 +49,12 @@ unsigned int es; } -char * -erealloc(cp, n) /* reallocate cp to size n */ -register char *cp; -unsigned int n; +extern char * /* reallocate cp to size n */ +erealloc(register char *cp, unsigned int n) { if (n == 0) { if (cp != NULL) - free(cp); + free((void *)cp); return(NULL); } @@ -75,9 +71,8 @@ unsigned int n; } -void -efree(cp) /* free memory allocated by above */ -char *cp; +extern void /* free memory allocated by above */ +efree(char *cp) { - free((char *)cp); + free((void *)cp); }