Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Cockpit / cockpit.h

diff --git a/Cockpit/cockpit.h b/Cockpit/cockpit.h
index 90d992f4a1832d61261598515f1e2d2621cc70b2..a70d4a7a8f209d90370021c76f2fc181c4c18245 100644 (file)
--- a/Cockpit/cockpit.h
+++ b/Cockpit/cockpit.h
@@ -24,13 +24,13 @@
  **************************************************************************/
  
 
-#include "hud.h"
+#include <Cockpit/hud.h>
 
 
 // And in the future (near future i hope).
-// #include "panel.h"
+// #include <Cockpit/panel.h>
 
-struct COCKPIT {
+struct fgCOCKPIT {
        int code;
        Hptr hud;
        // As above.
@@ -38,12 +38,24 @@ struct COCKPIT {
        int status;
 };
 
-struct COCKPIT *fgCockpitInit( struct AIRCRAFT cur_aircraft );
-void fgCockpitUpdate();
+struct fgCOCKPIT *fgCockpitInit( struct fgAIRCRAFT cur_aircraft );
+void fgCockpitUpdate( void );
 
 
 /* $Log$
-/* Revision 1.1  1997/08/29 18:03:21  curt
-/* Initial revision.
+/* 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 {}"
+ *
+ * Revision 1.1  1997/08/29 18:03:21  curt
+ * Initial revision.
+ *
  */