Win32 fixes

diff --git a/simgear/props/AtomicChangeListener.cxx b/simgear/props/AtomicChangeListener.cxx
index e0617d7bbbd9e79b9879404a3b941b48a13831ed..5b324885e01197e3bc2eec23a73dc7d65c12d56a 100644 (file)
--- 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 833ff515a7844cf14c11181081fa2fc94a8ee7d9..be4b03452d035e0e89ff8b592bbf78fae61244f5 100644 (file)
--- 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 5f0c163807312c5ee37a8cbbc0153566c6ca5cda..66c26addba0ea60ca68522cc6fd80dcccb095f1b 100644 (file)
--- 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 48a5bd0d41b40555a2ab9faeee6cab9161fcd88f..50a6d66375608d1c585be7ad069c0f270bca0957 100644 (file)
--- 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>