--- ray/src/cal/calc.c	2003/02/22 02:07:20	1.1
+++ ray/src/cal/calc.c	2003/07/17 09:21:29	1.4
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: calc.c,v 1.1 2003/02/22 02:07:20 greg Exp $";
+static const char	RCSid[] = "$Id: calc.c,v 1.4 2003/07/17 09:21:29 schorsch Exp $";
 #endif
 /*
  *  calc.c - simple algebraic desk calculator program.
@@ -7,26 +7,20 @@ static const char	RCSid[] = "$Id: calc.c,v 1.1 2003/02
  *     4/1/86
  */
 
+#include  <stdlib.h>
 #include  <stdio.h>
-
+#include  <string.h>
 #include  <setjmp.h>
-
 #include  <ctype.h>
 
+#include  "rterror.h"
 #include  "calcomp.h"
 
-
 #define  MAXRES		100
 
 double  result[MAXRES];
 int	nres = 0;
 
-#ifndef BSD
-#define  index		strchr
-#endif
-extern char  *index(), *fgets();
-
-
 jmp_buf  env;
 int  recover = 0;
 
@@ -95,8 +89,8 @@ char  *argv[];
 			eclock++;
 			continue;
 		}
-		if ((cp = index(expr, '=')) != NULL ||
-				(cp = index(expr, ':')) != NULL) {
+		if ((cp = strchr(expr, '=')) != NULL ||
+				(cp = strchr(expr, ':')) != NULL) {
 			if (cp[1])
 				scompile(expr, NULL, 0);
 			else if (*cp == '=') {