From 4214e32d742f0340012bcd7eab86fb6ee0ff966f Mon Sep 17 00:00:00 2001
From: "John M. Penn" <john.m.penn@nasa.gov>
Date: Fri, 4 Sep 2015 14:26:43 -0500
Subject: [PATCH] restore cannon_jet_proto.h so swig doesn't have problems.
 Tutorial will need to be modified.

---
 .../cannon/aero/include/cannon_aero_proto.h   |  3 ---
 .../cannon/aero/include/cannon_jet_proto.h    | 19 +++++++++++++++++++
 .../cannon/aero/src/cannon_force_jet.c        |  2 +-
 trick_sims/SIM_cannon_jet/S_define            |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 trick_models/cannon/aero/include/cannon_jet_proto.h

diff --git a/trick_models/cannon/aero/include/cannon_aero_proto.h b/trick_models/cannon/aero/include/cannon_aero_proto.h
index 203e0874..ea0aa246 100644
--- a/trick_models/cannon/aero/include/cannon_aero_proto.h
+++ b/trick_models/cannon/aero/include/cannon_aero_proto.h
@@ -20,9 +20,6 @@ int cannon_integ_aero(CANNON_AERO*) ;
 double cannon_impact_aero(CANNON_AERO*) ;
 int cannon_aero_default_data(CANNON_AERO*) ;
 
-/* Tutorial Section 9 */
-int cannon_force_jet(CANNON_AERO*) ;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/trick_models/cannon/aero/include/cannon_jet_proto.h b/trick_models/cannon/aero/include/cannon_jet_proto.h
new file mode 100644
index 00000000..ccfb5418
--- /dev/null
+++ b/trick_models/cannon/aero/include/cannon_jet_proto.h
@@ -0,0 +1,19 @@
+/****************************** TRICK HEADER ******************************
+PURPOSE: (Cannon_aero Prototypes)
+Tutorial Section 9
+***************************************************************************/
+#ifndef CANNON_JET_PROTO_H
+#define CANNON_JET_PROTO_H
+#include "cannon_aero.h"
+#include "cannon_aero_proto.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int cannon_force_jet(CANNON_AERO*) ;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/trick_models/cannon/aero/src/cannon_force_jet.c b/trick_models/cannon/aero/src/cannon_force_jet.c
index deea1e14..5f12320c 100644
--- a/trick_models/cannon/aero/src/cannon_force_jet.c
+++ b/trick_models/cannon/aero/src/cannon_force_jet.c
@@ -2,7 +2,7 @@
 PURPOSE: ( Jet fire force )
 Tutorial Section 9
 ***************************************************************************/
-#include "../include/cannon_aero_proto.h"
+#include "../include/cannon_jet_proto.h"
 
 int cannon_force_jet( CANNON_AERO *C ) {
 
diff --git a/trick_sims/SIM_cannon_jet/S_define b/trick_sims/SIM_cannon_jet/S_define
index 0610f797..59a35e9f 100644
--- a/trick_sims/SIM_cannon_jet/S_define
+++ b/trick_sims/SIM_cannon_jet/S_define
@@ -16,7 +16,7 @@ LIBRARY DEPENDENCY: ((cannon/aero/src/cannon_init_aero.c)
 #include "sim_objects/default_trick_sys.sm"
 
 ##include "cannon/aero/include/cannon_aero.h"
-##include "cannon/aero/include/cannon_aero_proto.h"
+##include "cannon/aero/include/cannon_jet_proto.h"
 
 class CannonSimObject : public Trick::SimObject {