--- ray/src/common/rtmisc.h 2003/07/14 22:23:59 3.3 +++ ray/src/common/rtmisc.h 2004/03/28 20:33:12 3.6 @@ -1,26 +1,28 @@ -/* RCSid $Id: rtmisc.h,v 3.3 2003/07/14 22:23:59 schorsch Exp $ */ +/* RCSid $Id: rtmisc.h,v 3.6 2004/03/28 20:33:12 schorsch Exp $ */ /* * Miscellaneous Radiance definitions */ #ifndef _RAD_RTMISC_H_ #define _RAD_RTMISC_H_ -#include - /* memory operations */ -#ifdef NOSTRUCTASS -#include -#define copystruct(d,s) memcpy((void *)(d),(void *)(s),sizeof(*(d))) -#else -#define copystruct(d,s) (*(d) = *(s)) -#endif +#include #ifdef __cplusplus extern "C" { #endif /* defined in bmalloc.c */ -extern char *bmalloc(unsigned int n); -extern void bfree(char *p, unsigned int n); +extern void *bmalloc(size_t size); +extern void bfree(void *ptr, size_t size); + + /* defined in ealloc.c */ +extern void *emalloc(size_t size); +extern void *ecalloc(size_t nmemb, size_t size); +extern void *erealloc(void *ptr, size_t size); +extern void efree(void *ptr); + + /* defined in myhostname.c */ +extern char *myhostname(void); #ifdef __cplusplus }