--- ray/src/common/loadvars.c	2003/02/25 02:47:21	2.10
+++ ray/src/common/loadvars.c	2003/07/27 22:12:01	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: loadvars.c,v 2.10 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.13 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  Routines for loading and checking variables from file.
@@ -10,6 +10,8 @@ static const char	RCSid[] = "$Id: loadvars.c,v 2.10 20
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+
+#include "standard.h"
 #include "vars.h"
 
 #define NOCHAR	127		/* constant for character to delete */
@@ -88,13 +90,13 @@ VARIABLE	*(*mv)();
 	if (vp == NULL)
 		return(-1);
 					/* assign new value */
-	if (i = vp->nass) {
+	if ( (i = vp->nass) ) {
 		cp = vp->value;
 		while (i--)
 			while (*cp++)
 				;
 		i = cp - vp->value;
-		vp->value = (char *)realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc((void *)vp->value, i+n+1);
 	} else
 		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
@@ -138,7 +140,7 @@ register int	n;
 {
 	register char	*cp;
 
-	if (vval(vn) == NULL | n < 0 | n >= vdef(vn))
+	if ((vval(vn) == NULL) | (n < 0) | (n >= vdef(vn)))
 		return(NULL);
 	cp = vval(vn);
 	while (n--)