Working 'noshadow' animation

[simgear.git] / simgear / serial / serial.hxx

diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index 6441964ca1c8fbbf4ee8fc77685c583bc25453d8..6e9ec8dd0a5c355e9330c3bc21d942e96a022eaf 100644 (file)
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -32,13 +32,13 @@
 # error This library requires C++
 #endif
 
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
+#ifdef _WIN32
 #  include <windows.h>
 #endif
 
 #include <simgear/compiler.h>
-#include STL_STRING
-SG_USING_STD(string);
+#include <string>
+using std::string;
 
 // if someone know how to do this all with C++ streams let me know
 // #include <stdio.h>
@@ -49,7 +49,7 @@ SG_USING_STD(string);
  */
 class SGSerialPort
 {
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
+#ifdef  _WIN32
     typedef HANDLE fd_type;
 #else
     typedef int fd_type;