--- ray/src/common/rtmisc.h	2003/06/27 06:53:21	3.1
+++ ray/src/common/rtmisc.h	2004/03/28 20:33:12	3.6
@@ -1,36 +1,28 @@
-/* RCSid $Id: rtmisc.h,v 3.1 2003/06/27 06:53:21 greg 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 <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include  <stdlib.h>
-					/* memory operations */
-#ifdef	NOSTRUCTASS
-#define	 copystruct(d,s)	bcopy((void *)(s),(void *)(d),sizeof(*(d)))
-#else
-#define	 copystruct(d,s)	(*(d) = *(s))
-#endif
+					/* defined in bmalloc.c */
+extern void	*bmalloc(size_t size);
+extern void	bfree(void *ptr, size_t size);
 
-#ifndef BSD
-#define	 bcopy(s,d,n)		(void)memcpy(d,s,n)
-#define	 bzero(d,n)		(void)memset(d,0,n)
-#define	 bcmp(b1,b2,n)		memcmp(b1,b2,n)
-#endif
+					/* 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);
 
-#ifdef _WIN32
-#define NIX 1
-#endif
-#ifdef AMIGA
-#define NIX 1
-#endif
-					/* defined in bmalloc.c */
-extern char	*bmalloc(unsigned int n);
-extern void	bfree(char *p, unsigned int n);
+					/* defined in myhostname.c */
+extern char	*myhostname(void);
 
 #ifdef __cplusplus
 }