--- ray/src/common/standard.h	1991/11/12 16:54:58	2.1
+++ ray/src/common/standard.h	1992/09/21 12:04:27	2.2
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 /* SCCSid "$SunId$ LBL" */
 
@@ -8,6 +8,8 @@
 
 #include  <stdio.h>
 
+#include  <fcntl.h>
+
 #include  <math.h>
 
 #include  <errno.h>
@@ -24,47 +26,53 @@ typedef struct {
 	XF  b;					/* backward */
 }  FULLXF;
 
-#ifdef  M_PI
-#define  PI		M_PI
+#ifdef	M_PI
+#define	 PI		M_PI
 #else
-#define  PI		3.14159265358979323846
+#define	 PI		3.14159265358979323846
 #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 */
+#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
 				/* error codes */
-#define  WARNING	1		/* non-fatal error */
-#define  USER		2		/* fatal user-caused error */
-#define  SYSTEM		3		/* fatal system-related error */
-#define  INTERNAL	4		/* fatal program-related error */
-#define  CONSISTENCY	5		/* bad consistency check, abort */
-#define  COMMAND	6		/* interactive error */
+#define	 WARNING	1		/* non-fatal error */
+#define	 USER		2		/* fatal user-caused error */
+#define	 SYSTEM		3		/* fatal system-related error */
+#define	 INTERNAL	4		/* fatal program-related error */
+#define	 CONSISTENCY	5		/* bad consistency check, abort */
+#define	 COMMAND	6		/* interactive error */
 
 extern char  errmsg[];			/* global buffer for error messages */
 
-extern int  errno;			/* system error number */
-
 					/* memory operations */
-#ifdef  NOSTRUCTASS
-#define  copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
+#ifdef	NOSTRUCTASS
+#define	 copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
 #else
-#define  copystruct(d,s)	(*(d) = *(s))
+#define	 copystruct(d,s)	(*(d) = *(s))
 #endif
 
-#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)
+#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)
 extern char  *memcpy(), *memset();
-#define  index			strchr
-#define  rindex			strrchr
+#define	 index			strchr
+#define	 rindex			strrchr
 #endif
 
 extern char  *sskip();
 extern char  *getpath(), *getenv();
 extern char  *malloc(), *calloc(), *realloc();
 extern char  *bmalloc(), *savestr(), *savqstr();
+
+#ifdef MSDOS
+#define NIX 1
+#endif
+#ifdef AMIGA
+#define NIX 1
+#endif
+