--- ray/src/cv/mgflib/mgf2inv.c	1997/05/22 08:41:04	1.7
+++ ray/src/cv/mgflib/mgf2inv.c	2003/08/05 20:40:16	1.10
@@ -1,9 +1,6 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mgf2inv.c,v 1.10 2003/08/05 20:40:16 greg Exp $";
 #endif
-
 /*
  * Convert MGF to Inventor file.
  *
@@ -12,6 +9,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include <stdio.h>
 
+#include <stdlib.h>
+
 #include <math.h>
 
 #include <ctype.h>
@@ -353,7 +352,8 @@ put_material()			/* put out current material */
 	indent(0);
 	printf("%s}\n", tabs);
 	if (outtype != O_INV1)
-		printf("%sShapeHints { shapeType %s }\n", tabs,
+		printf("%sShapeHints { shapeType %s faceType UNKNOWN_FACE_TYPE }\n",
+			tabs,
 			c_cmaterial->sided ? "SOLID" : "UNKNOWN_SHAPE_TYPE");
 	indent(0);
 	printf("%s}\n", tabs);
@@ -460,7 +460,7 @@ char	**av;
 	if (put_material() < 0)
 		return(MG_EBADMAT);
 				/* get endpoints */
-	if ((v1 = c_getvert(av[1])) == NULL | (v2 = c_getvert(av[3])) == NULL)
+	if (((v1 = c_getvert(av[1])) == NULL) | ((v2 = c_getvert(av[3])) == NULL))
 		return(MG_EUNDEF);
 				/* get radius */
 	if (!isflt(av[2]))