Changed #ifdef FILE_H to #ifdef _FILE_H

[flightgear.git] / Scenery / obj.h

diff --git a/Scenery/obj.h b/Scenery/obj.h
index af8f4099d22d2df561a121d7167ef44eecde8ca2..7c10cd749836cbe519c7f2f1784350e153eb64fa 100644 (file)
--- a/Scenery/obj.h
+++ b/Scenery/obj.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef OBJ_H
-#define OBJ_H
+#ifndef _OBJ_H
+#define _OBJ_H
 
 
 #ifdef WIN32
@@ -34,16 +34,29 @@
 
 #include <GL/glut.h>
 
+#include <Include/types.h>
+
 
 /* Load a .obj file and generate the GL call list */
-GLint fgObjLoad(char *file);
+GLint fgObjLoad(char *file, struct fgCartesianPoint *ref);
 
 
-#endif /* OBJ_H */
+#endif /* _OBJ_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/10/28 21:14:55  curt
-/* Initial revision.
+/* Revision 1.4  1998/01/22 02:59:41  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 19:27:17  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.2  1998/01/13 00:23:10  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
+ * Revision 1.1  1997/10/28 21:14:55  curt
+ * Initial revision.
+ *
  */