From e7ec83d626504c685bcd8a7e5fe74e8696c49ff6 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Sun, 17 Jan 2010 11:59:49 +0000
Subject: [PATCH] Win32 fixes

---
 simgear/props/AtomicChangeListener.cxx   | 5 +++++
 simgear/scene/material/EffectBuilder.hxx | 2 +-
 simgear/scene/tgdb/TreeBin.cxx           | 4 ++++
 simgear/scene/util/CopyOp.cxx            | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/simgear/props/AtomicChangeListener.cxx b/simgear/props/AtomicChangeListener.cxx
index e0617d7b..5b324885 100644
--- a/simgear/props/AtomicChangeListener.cxx
+++ b/simgear/props/AtomicChangeListener.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "AtomicChangeListener.hxx"
 
 #include <algorithm>
diff --git a/simgear/scene/material/EffectBuilder.hxx b/simgear/scene/material/EffectBuilder.hxx
index 833ff515..be4b0345 100644
--- a/simgear/scene/material/EffectBuilder.hxx
+++ b/simgear/scene/material/EffectBuilder.hxx
@@ -266,7 +266,7 @@ public:
         else
             return itr->second.ptr();
     }
-    template<typename T> friend class InstallAttributeBuilder;
+    template<typename T> friend struct InstallAttributeBuilder;
 };
 
 template<typename T>
diff --git a/simgear/scene/tgdb/TreeBin.cxx b/simgear/scene/tgdb/TreeBin.cxx
index 5f0c1638..66c26add 100644
--- a/simgear/scene/tgdb/TreeBin.cxx
+++ b/simgear/scene/tgdb/TreeBin.cxx
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <algorithm>
 #include <vector>
 #include <string>
diff --git a/simgear/scene/util/CopyOp.cxx b/simgear/scene/util/CopyOp.cxx
index 48a5bd0d..50a6d663 100644
--- a/simgear/scene/util/CopyOp.cxx
+++ b/simgear/scene/util/CopyOp.cxx
@@ -17,6 +17,10 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA  02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "CopyOp.hxx"
 
 #include <simgear/scene/material/Effect.hxx>
-- 
2.39.5