Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss

[flightgear.git] / Cockpit / cockpit.h

diff --git a/Cockpit/cockpit.h b/Cockpit/cockpit.h
index b8c032806968d24494234be9b7a3787cf1323a79..237397b6633ab7575f4b7f13b893274cabc28cea 100644 (file)
--- a/Cockpit/cockpit.h
+++ b/Cockpit/cockpit.h
@@ -24,29 +24,47 @@
  **************************************************************************/
  
 
-#include "hud.h"
+#ifndef _COCKPIT_H
+#define _COCKPIT_H
+
+
+#include <Cockpit/hud.h>
 
 
 // And in the future (near future i hope).
-// #include "panel.h"
+// #include <Cockpit/panel.h>
 
-struct fgCOCKPIT {
+typedef struct  {
        int code;
        Hptr hud;
        // As above.
        // PANEL *panel;
        int status;
-};
+}fgCOCKPIT, *pfgCockpit;
 
-struct fgCOCKPIT *fgCockpitInit( struct fgAIRCRAFT cur_aircraft );
+fgCOCKPIT *fgCockpitInit( fgAIRCRAFT *cur_aircraft );
 void fgCockpitUpdate( void );
 
 
+#endif /* _COCKPIT_H */
+
+
 /* $Log$
-/* Revision 1.3  1998/01/19 18:40:19  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.6  1998/02/07 15:29:33  curt
+/* Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+/* <chotchkiss@namg.us.anritsu.com>
 /*
+ * Revision 1.5  1998/01/22 02:59:29  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.4  1998/01/19 19:27:01  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.3  1998/01/19 18:40:19  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.2  1997/12/10 22:37:39  curt
  * Prepended "fg" on the name of all global structures that didn't have it yet.
  * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"