upd: tmp

2 files changed, 19 insertions, 19 deletions

diff --git a/include/ballistics.h b/include/ballistics.h
index 7ba4248..ab68c3f 100644
--- a/include/ballistics.h
+++ b/include/ballistics.h
@@ -19,21 +19,4 @@ double retard(DragFunction drag_function,
 			  double velocity,
 			  double temperature);
 
-typedef struct RangeCardRecord RangeCardRecord;
-struct RangeCardRecord {
-	size_t n;
-	double range;
-	double elevation;
-	Windage windage;
-	double lead;
-	double time_of_flight;
-	double bullet_speed;
-	double kinetic_energy;
-};
-typedef struct RangeCard RangeCard;
-struct RangeCard {
-	RangeCardRecord *card;
-	size_t records;
-};
-
 #endif
diff --git a/include/context.h b/include/context.h
index dd207bb..ce5f913 100644
--- a/include/context.h
+++ b/include/context.h
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "ace.h"
 #include "drag_model.h"
 
 typedef enum {
@@ -55,6 +54,24 @@ typedef struct {
 	double w2;
 } Windage;
 
+typedef struct RangeCardRecord RangeCardRecord;
+struct RangeCardRecord {
+	size_t n;
+	double range;
+	double elevation;
+	Windage windage;
+	double lead;
+	double time_of_flight;
+	double bullet_speed;
+	double kinetic_energy;
+};
+
+typedef struct RangeCard RangeCard;
+struct RangeCard {
+	RangeCardRecord *card;
+	size_t records;
+};
+
 typedef struct {
 	double elev;
 	Windage windage;
@@ -65,7 +82,7 @@ typedef struct {
 	double coriolis_vdrift;
 	double coriolis_hdrift;
 	double spin_drift;
-	double *range_card;
+	RangeCard *range_card;
 } ATragMXSolution;
 
 #endif