X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fserial%2Fserial.hxx;h=6e9ec8dd0a5c355e9330c3bc21d942e96a022eaf;hb=a131f442477a11894169933755591674bb7ad5e9;hp=7534372c1a9ffdf7b81aba475a8f54c136b67465;hpb=828a9a8c51b6aacf641c33c664c55809fe385e99;p=simgear.git

diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index 7534372c..6e9ec8dd 100644
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started November 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1998  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -17,10 +17,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -33,17 +32,13 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#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>
@@ -52,9 +47,9 @@ SG_USING_STD(string);
 /**
  * A class to encapsulate low level serial port IO.
  */
-class FGSerialPort
+class SGSerialPort
 {
-#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
+#ifdef  _WIN32
     typedef HANDLE fd_type;
 #else
     typedef int fd_type;
@@ -68,17 +63,17 @@ private:
 public:
 
     /** Default constructor */
-    FGSerialPort();
+    SGSerialPort();
 
     /**
      * Constructor
      * @param device device name
      * @param baud baud rate
      */
-    FGSerialPort(const string& device, int baud);
+    SGSerialPort(const string& device, int baud);
 
     /** Destructor */
-    ~FGSerialPort();
+    ~SGSerialPort();
 
     /** Open a the serial port
      * @param device name of device