Misc MSVC tweaks.

diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index ced2b2052a46018c8f0f27513ebcf7f7fcf53546..9003c086c92a9897729b6abbde15c390cd814ace 100644 (file)
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -42,7 +42,7 @@
 SG_USING_STD(string);
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
-#  include <winsock2.h>
+#  include <winsock.h>
 #endif
 
 #define SG_MAX_SOCKET_QUEUE 32

diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx
index 71b707df39b4546cab322b920b6ff67d05ca7aa1..bcaf66647732cb575a83d61262c3c61f3b37cf40 100644 (file)
--- a/simgear/misc/props.hxx
+++ b/simgear/misc/props.hxx
@@ -694,7 +694,7 @@ public:
   /**
    * Check a single mode attribute for the property node.
    */
-  bool getAttribute (Attribute attr) const { return (_attr & attr); }
+  bool getAttribute (Attribute attr) const { return (bool)(_attr & attr); }
 
 
   /**