--- ray/src/common/readoct.c	2003/07/21 22:30:17	2.21
+++ ray/src/common/readoct.c	2003/10/22 02:06:34	2.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readoct.c,v 2.21 2003/07/21 22:30:17 schorsch Exp $";
+static const char	RCSid[] = "$Id: readoct.c,v 2.23 2003/10/22 02:06:34 greg Exp $";
 #endif
 /*
  *  readoct.c - routines to read octree information.
@@ -10,8 +10,8 @@ static const char	RCSid[] = "$Id: readoct.c,v 2.21 200
 #include  <stdio.h>
 #include  <time.h>
 
-#include  "standard.h"
 #include  "platform.h"
+#include  "standard.h"
 #include  "octree.h"
 #include  "object.h"
 #include  "otypes.h"
@@ -201,7 +201,7 @@ gettree()			/* get a pre-ordered octree */
 	default:
 		octerror(USER, "damaged octree");
 	}
-	return NULL; /* pro forma return */
+	return EMPTY; /* pro forma return */
 }