From 8ac87ab5e634146fe23af85f42404a4fe67e2cae Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sat, 24 May 2003 08:37:31 +0000
Subject: [PATCH] Provide a better(?) solution to the windows GDI problem

---
 src/FDM/LaRCsim/LaRCsimIC.cxx | 4 ----
 src/FDM/LaRCsim/ls_generic.h  | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/FDM/LaRCsim/LaRCsimIC.cxx b/src/FDM/LaRCsim/LaRCsimIC.cxx
index db2bbc4c5..562d0c5fa 100644
--- 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 3a4b1f6cb..72af3fa2d 100644
--- 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 */