--- ray/src/common/error.c	2003/02/25 02:47:21	2.7
+++ ray/src/common/error.c	2003/07/27 22:12:01	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: error.c,v 2.7 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: error.c,v 2.10 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  error.c - standard error reporting function
@@ -9,8 +9,11 @@ static const char	RCSid[] = "$Id: error.c,v 2.7 2003/0
 
 #include "copyright.h"
 
-#include  "standard.h"
+#include  <stdio.h>
+#include  <stdlib.h>
 
+#include  "rterror.h"
+
 extern char	*strerror();
 				/* global list of error actions */
 struct erract	erract[NERRS] = ERRACT_INIT;
@@ -25,7 +28,7 @@ char  *emsg;
 {
 	register struct erract	*ep;
 
-	if (etype < 0 | etype >= NERRS)
+	if ((etype < 0) | (etype >= NERRS))
 		return;
 	ep = erract + etype;
 	if (ep->pf != NULL) {