--- ray/src/cal/tabfunc.c	2003/06/26 00:58:09	1.3
+++ ray/src/cal/tabfunc.c	2003/07/27 22:12:01	1.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: tabfunc.c,v 1.3 2003/06/26 00:58:09 schorsch Exp $";
+static const char	RCSid[] = "$Id: tabfunc.c,v 1.5 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  * Put tabular data into functions suitable for cal programs.
@@ -12,15 +12,11 @@ static const char	RCSid[] = "$Id: tabfunc.c,v 1.3 2003
 #include <string.h>
 #include <math.h>
 #include <ctype.h>
-#ifdef _WIN32
- #include <process.h> /* getpid() */
-#else
- #include <sys/types.h>
- #include <unistd.h>
-#endif
+#include <sys/types.h>
 
-#include "standard.h"
-#include "platform.h"
+#include "rtprocess.h" /* getpid() */
+#include "rtmath.h"
+#include "rtio.h"
 
 #define  isdelim(c)	(isspace(c) || (c)==',')
 
@@ -191,7 +187,7 @@ char	*xe
 
 	xelen = strlen(xe);
 	for (i = 0; i < nfuncs; i++) {
-		if (func[i][0] == '\0' | func[i][0] == '0')
+		if ((func[i][0] == '\0') | (func[i][0] == '0'))
 			continue;
 		if (interpolate) {
 			printf("%s`%s(i):select(i,", func[i], locID);