When instantiating effects, copy user data of any created nodes.

[simgear.git] / simgear / serial / serial.cxx

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index bcb1897c0c38d47214e7dc1a93a553be3af533cd..2d273090803165e24ac4ebe7e599301a49f3b270 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -23,13 +23,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-
-#ifdef SG_HAVE_STD_INCLUDE
-#  include <cerrno>
-#else
-#  include <errno.h>
-#endif
+#include <iostream>
+#include <cerrno>
 
 #if !defined( WIN32 ) || defined( __CYGWIN__) || defined( __CYGWIN32__ )
 #  include <termios.h>
@@ -122,6 +117,9 @@ bool SGSerialPort::open_port(const string& device) {
 
     // cout << "config.c_iflag = " << config.c_iflag << endl;
 
+    // disable LF expanded to CR-LF
+    config.c_oflag &= ~(ONLCR);
+
     // disable software flow control
     config.c_iflag &= ~(IXON | IXOFF | IXANY);