I forgot a linker dependency. It really si time to figure out why these are all needed.

[flightgear.git] / src / FDM / LaRCsim / ls_generic.h

diff --git a/src/FDM/LaRCsim/ls_generic.h b/src/FDM/LaRCsim/ls_generic.h
index e351efc1139e209ac410a52c26c42a57268d8d6f..6a300b6ee79916840456010349b63b1cd3e96c6c 100644 (file)
--- a/src/FDM/LaRCsim/ls_generic.h
+++ b/src/FDM/LaRCsim/ls_generic.h
@@ -81,13 +81,6 @@ extern "C" {
 
 typedef struct {
 
-/*
- * Needed for windows builds
- */
-#ifdef Alpha
-#undef Alpha
-#endif
-
 /*================== Mass properties and geometry values ==================*/
        
     DATA    mass, i_xx, i_yy, i_zz, i_xz;      /* Inertias */
@@ -343,10 +336,10 @@ typedef struct {
 #define Centrifugal_relief     generic_.centrifugal_relief
 
     DATA    alpha, beta, alpha_dot, beta_dot;  /* in radians   */
-#define Alpha                  generic_.alpha
-#define Beta                   generic_.beta
-#define Alpha_dot              generic_.alpha_dot
-#define Beta_dot               generic_.beta_dot
+#define Std_Alpha              generic_.alpha
+#define Std_Beta               generic_.beta
+#define Std_Alpha_dot          generic_.alpha_dot
+#define Std_Beta_dot           generic_.beta_dot
 
     DATA    cos_alpha, sin_alpha, cos_beta, sin_beta;
 #define Cos_alpha              generic_.cos_alpha