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

[flightgear.git] / Controls / controls.c

diff --git a/Controls/controls.c b/Controls/controls.c
index 6b2173e4d65e3701b8fbb53123abbecffaf9eaf0..d5128ca41280a7b8e5c4a024895bc7adc6db7bbe 100644 (file)
--- a/Controls/controls.c
+++ b/Controls/controls.c
@@ -24,11 +24,11 @@
  **************************************************************************/
 
 
-#include "controls.h"
-#include "../Aircraft/aircraft.h"
+#include <Controls/controls.h>
+#include <Aircraft/aircraft.h>
 
 
-void fgControlsInit() {
+void fgControlsInit( void ) {
     int i;
     struct fgCONTROLS *c;
     c = &current_aircraft.controls;
@@ -167,10 +167,18 @@ void fgThrottleSet(int engine, double pos) {
 
 
 /* $Log$
-/* Revision 1.4  1997/12/10 22:37:41  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.6  1998/01/19 19:27:02  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.5  1998/01/19 18:40:22  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.4  1997/12/10 22:37:41  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.3  1997/08/27 03:30:01  curt
  * Changed naming scheme of basic shared structures.
  *