--- ray/src/common/standard.h	1998/08/12 17:57:44	2.13
+++ ray/src/common/standard.h	2003/06/27 06:53:22	2.31
@@ -1,115 +1,16 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid $Id: standard.h,v 2.31 2003/06/27 06:53:22 greg Exp $ */
 /*
- *	Miscellaneous definitions required by many routines.
+ *	Collected includes required by many Radiance callers
  */
+#ifndef _RAD_STANDARD_H_
+#define _RAD_STANDARD_H_
 
-#include  <stdio.h>
+#include  "copyright.h"
 
-#include  <sys/types.h>
+#include  "rtio.h"
+#include  "rtmisc.h"
+#include  "rtmath.h"
+#include  "rterror.h"
 
-#include  <fcntl.h>
-
-#include  <math.h>
-
-#include  <errno.h>
-
-#include  "mat4.h"
-				/* regular transformation */
-typedef struct {
-	MAT4  xfm;				/* transform matrix */
-	FLOAT  sca;				/* scalefactor */
-}  XF;
-				/* complemetary tranformation */
-typedef struct {
-	XF  f;					/* forward */
-	XF  b;					/* backward */
-}  FULLXF;
-
-#ifndef  PI
-#ifdef	M_PI
-#define	 PI		((double)M_PI)
-#else
-#define	 PI		3.14159265358979323846
-#endif
-#endif
-
-#ifndef	 F_OK			/* mode bits for access(2) call */
-#define	 R_OK		4		/* readable */
-#define	 W_OK		2		/* writable */
-#define	 X_OK		1		/* executable */
-#define	 F_OK		0		/* exists */
-#endif
-
-#ifndef  int2
-#define  int2		short		/* two-byte integer */
-#endif
-#ifndef  int4
-#define  int4		int		/* four-byte integer */
-#endif
-
-extern int  eputs(), wputs();	/* standard error output functions */
-
-				/* error codes */
-#define	 WARNING	0		/* non-fatal error */
-#define	 USER		1		/* fatal user-caused error */
-#define	 SYSTEM		2		/* fatal system-related error */
-#define	 INTERNAL	3		/* fatal program-related error */
-#define	 CONSISTENCY	4		/* bad consistency check, abort */
-#define	 COMMAND	5		/* interactive error */
-#define  NERRS		6
-				/* error struct */
-extern struct erract {
-	char	pre[16];		/* prefix message */
-	int	(*pf)();		/* put function (resettable) */
-	int	ec;			/* exit code (0 means non-fatal) */
-} erract[NERRS];	/* list of error actions */
-
-#define  ERRACT_INIT	{	{"warning - ", wputs, 0}, \
-				{"fatal - ", eputs, 1}, \
-				{"system - ", eputs, 2}, \
-				{"internal - ", eputs, 1}, \
-				{"consistency - ", eputs, -1}, \
-				{"", NULL, 0}	}
-
-extern char  errmsg[];			/* global buffer for error messages */
-
-					/* memory operations */
-#ifdef	NOSTRUCTASS
-#define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
-#else
-#define	 copystruct(d,s)	(*(d) = *(s))
-#endif
-
-#ifdef	 BSD
-extern long  lseek();
-#else
-#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)
-#define	 index			strchr
-#define	 rindex			strrchr
-extern off_t  lseek();
-#endif
-extern long  ftell();
-
-extern char  *sskip(), *sskip2();
-extern char  *getpath(), *getenv();
-#ifndef malloc
-extern char  *malloc(), *calloc(), *realloc();
-#endif
-extern char  *bmalloc(), *savestr(), *savqstr();
-
-#ifdef  DCL_ATOF
-extern double  atof();
-#endif
-
-#ifdef MSDOS
-#define NIX 1
-#endif
-#ifdef AMIGA
-#define NIX 1
-#endif
+#endif /* _RAD_STANDARD_H_ */