X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fsockets%2Fserialport.h;h=7b0a3a0be8af8b9764c74e2ca4f68d5f94871f26;hb=9b53a148ade63466655e6e5d8cb0ca2b64a76ae3;hp=bbe01363ce69266f484c4157df19cda7a0bb1734;hpb=24048d575419fe909fade9110fab48d17370ee6f;p=deb_libcec.git

diff --git a/src/lib/platform/sockets/serialport.h b/src/lib/platform/sockets/serialport.h
index bbe0136..7b0a3a0 100644
--- a/src/lib/platform/sockets/serialport.h
+++ b/src/lib/platform/sockets/serialport.h
@@ -2,7 +2,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -60,23 +60,23 @@ namespace PLATFORM
       CStdString GetName(void) const
       {
         CStdString strName;
-        strName = m_name;
+        strName = m_strName;
         return strName;
       }
 
-  #ifdef __WINDOWS__
+    #ifdef __WINDOWS__
       virtual bool IsOpen(void);
       virtual void Close(void);
       virtual int64_t Write(uint8_t* data, uint32_t len);
       virtual int32_t Read(uint8_t* data, uint32_t len, uint64_t iTimeoutMs = 0);
+    #endif
 
-  private:
-      void FormatWindowsError(int iErrorCode, CStdString &strMessage);
+    private:
       bool SetBaudRate(uint32_t baudrate);
 
-      std::string  m_name;
-      bool         m_tostdout;
-
+    private:
+    #ifdef __WINDOWS__
+      void FormatWindowsError(int iErrorCode, CStdString &strMessage);
       bool SetTimeouts(bool bBlocking);
 
       HANDLE                m_handle; 
@@ -91,5 +91,7 @@ namespace PLATFORM
   #else
       struct termios     m_options;
   #endif
+      std::string  m_strName;
+      bool         m_bToStdOut;
   };
 };