ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/rtmisc.h

Comparing ray/src/common/rtmisc.h (file contents):
Revision 3.1 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 3.6 by schorsch, Sun Mar 28 20:33:12 2004 UTC

#	Line 4 | Line 4
4		*/
5		#ifndef _RAD_RTMISC_H_
6		#define _RAD_RTMISC_H_
7	+
8	+	#include <stdlib.h>
9	+
10		#ifdef __cplusplus
11		extern "C" {
12		#endif
13
14	<	#include  <stdlib.h>
15	<	/* memory operations */
16	<	#ifdef  NOSTRUCTASS
14	<	#define  copystruct(d,s)        bcopy((void *)(s),(void *)(d),sizeof(*(d)))
15	<	#else
16	<	#define  copystruct(d,s)        (*(d) = *(s))
17	<	#endif
14	>	/* defined in bmalloc.c */
15	>	extern void     *bmalloc(size_t size);
16	>	extern void     bfree(void *ptr, size_t size);
17
18	<	#ifndef BSD
19	<	#define  bcopy(s,d,n)           (void)memcpy(d,s,n)
20	<	#define  bzero(d,n)             (void)memset(d,0,n)
21	<	#define  bcmp(b1,b2,n)          memcmp(b1,b2,n)
22	<	#endif
18	>	/* defined in ealloc.c */
19	>	extern void *emalloc(size_t size);
20	>	extern void *ecalloc(size_t nmemb, size_t size);
21	>	extern void *erealloc(void *ptr, size_t size);
22	>	extern void     efree(void *ptr);
23
24	<	#ifdef _WIN32
25	<	#define NIX 1
27	<	#endif
28	<	#ifdef AMIGA
29	<	#define NIX 1
30	<	#endif
31	<	/* defined in bmalloc.c */
32	<	extern char     *bmalloc(unsigned int n);
33	<	extern void     bfree(char *p, unsigned int n);
24	>	/* defined in myhostname.c */
25	>	extern char     *myhostname(void);
26
27		#ifdef __cplusplus
28		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)