--- ray/src/common/standard.h	2003/03/04 05:49:21	2.18
+++ ray/src/common/standard.h	2003/05/13 17:58:32	2.22
@@ -1,4 +1,4 @@
-/* RCSid $Id: standard.h,v 2.18 2003/03/04 05:49:21 greg Exp $ */
+/* RCSid $Id: standard.h,v 2.22 2003/05/13 17:58:32 greg Exp $ */
 /*
  *	Miscellaneous definitions required by many routines.
  */
@@ -87,15 +87,15 @@ extern double	tcos();			/* table-based cosine approxim
 #define  ttan(x)		(tsin(x)/tcos(x))
 #endif
 					/* custom version of assert(3) */
-#define  CHECK(be,et,em)	((be) ? error(et,em) : 0)
+#define  CHECK(be,et,em)	if (be) error(et,em); else
 #ifdef  DEBUG
 #define  DCHECK			CHECK
 #else
-#define  DCHECK(be,et,em)	0
+#define  DCHECK(be,et,em)	(void)0
 #endif
 					/* memory operations */
 #ifdef	NOSTRUCTASS
-#define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
+#define	 copystruct(d,s)	bcopy((void *)(s),(void *)(d),sizeof(*(d)))
 #else
 #define	 copystruct(d,s)	(*(d) = *(s))
 #endif
@@ -131,7 +131,7 @@ extern char	*fgetword();
 extern void	fputword();
 extern char	*fixargv0();
 extern FILE	*frlibopen();
-extern char	*getlibpath();
+extern char	*getrlibpath();
 extern char	*getpath();
 extern void	putstr();
 extern void	putint();
@@ -204,7 +204,7 @@ extern char	*fixargv0(char *av0);
 					/* defined in fropen.c */
 extern FILE	*frlibopen(char *fname);
 					/* defined in getlibpath.c */
-extern char	*getlibpath(void);
+extern char	*getrlibpath(void);
 					/* defined in getpath.c */
 extern char	*getpath(char *fname, char *searchpath, int mode);
 					/* defined in portio.c */
@@ -223,7 +223,7 @@ extern int	readbuf(int fd, char *bpos, int siz);
 extern int	writebuf(int fd, char *bpos, int siz);
 					/* defined in rexpr.c */
 extern int	ecompile(char *sp, int iflg, int wflag);
-extern char	*expsave();
+extern char	*expsave(void);
 extern void	expset(char *ep);
 extern char	*eindex(char *sp);
 					/* defined in savestr.c */