--- ray/src/hd/genrhgrid.c	1998/01/06 17:19:42	3.1
+++ ray/src/hd/genrhgrid.c	2003/07/27 22:12:02	3.5
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: genrhgrid.c,v 3.5 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Generate renderable grids from a holodeck file
  */
@@ -23,7 +20,7 @@ char	*argv[];
 	int	sect;
 
 	progname = argv[0];
-	if (argc < 5 | argc > 6)
+	if ((argc < 5) | (argc > 6))
 		goto userr;
 	mat = argv[1];
 	name = argv[2];
@@ -44,11 +41,10 @@ gridsect(fname, sect)		/* get specified section(s) and
 char	*fname;
 int	sect;
 {
-	extern long	ftell();
 	FILE	*fp;
 	HOLO	hdsect;
 	int	fd;
-	int4	nextloc;
+	int32	nextloc;
 	int	n;
 					/* open holodeck file */
 	if ((fp = fopen(fname, "r")) == NULL) {
@@ -64,9 +60,9 @@ int	sect;
 	nextloc = ftell(fp);			/* get stdio position */
 	fclose(fp);				/* done with stdio */
 	for (n = 0; nextloc > 0L; n++) {	/* get the section(s) */
-		lseek(fd, (long)nextloc, 0);
+		lseek(fd, (off_t)nextloc, 0);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
-		if (sect < 0 | n == sect) {
+		if ((sect < 0) | (n == sect)) {
 			read(fd, (char *)&hdsect, sizeof(HDGRID));
 			hdcompgrid(&hdsect);
 			putgrid(&hdsect);	/* print grid */