Provide a better(?) solution to the windows GDI problem

diff --git a/src/FDM/LaRCsim/LaRCsimIC.cxx b/src/FDM/LaRCsim/LaRCsimIC.cxx
index db2bbc4c59f568b6ca471139b98477a5c552ddae..562d0c5fa80d6ed0c800cb24f2392b6ad38f0349 100644 (file)
--- a/src/FDM/LaRCsim/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsim/LaRCsimIC.cxx
@@ -43,10 +43,6 @@ SG_USING_STD(cout);
 SG_USING_STD(endl);
 
 
-// Make Cygwin and MSVC builds happy
-#define NOGDI
-
-
 LaRCsimIC::LaRCsimIC(void) {
   vt=vtg=vw=vc=ve=0;
   mach=0;

diff --git a/src/FDM/LaRCsim/ls_generic.h b/src/FDM/LaRCsim/ls_generic.h
index 3a4b1f6cbe49b3e1bb158f8bfea62b426194470d..72af3fa2d1aa2152a71c9bf9754d52b6dd0814f0 100644 (file)
--- a/src/FDM/LaRCsim/ls_generic.h
+++ b/src/FDM/LaRCsim/ls_generic.h
@@ -81,6 +81,13 @@ 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 */