From cea751402e9135a4d994c597c82027e22b73ecee Mon Sep 17 00:00:00 2001
From: William Woodall <wjwwood@gmail.com>
Date: Sun, 29 Jan 2012 15:41:38 -0600
Subject: [PATCH] Adding some linux specific fixes. fixes #13

---
 include/serial/serial.h | 3 +++
 src/impl/unix.cc        | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/serial/serial.h b/include/serial/serial.h
index c05dad6..b9b033a 100644
--- a/include/serial/serial.h
+++ b/include/serial/serial.h
@@ -38,6 +38,9 @@
 
 #include <stdexcept>
 #include <string>
+#if defined(__linux__)
+#include <string.h>
+#endif
 #include <sstream>
 #include <vector>
 #include <limits>
diff --git a/src/impl/unix.cc b/src/impl/unix.cc
index 28243de..dae30de 100644
--- a/src/impl/unix.cc
+++ b/src/impl/unix.cc
@@ -14,6 +14,10 @@
 #include <sys/time.h>
 #include <time.h>
 
+#if defined(__linux__)
+#include <linux/serial.h>
+#endif
+
 #include "serial/impl/unix.h"
 
 #ifndef TIOCINQ
@@ -218,12 +222,12 @@ Serial::SerialImpl::reconfigurePort ()
       struct serial_struct ser;
       ioctl(fd_, TIOCGSERIAL, &ser);
       // set custom divisor
-      ser.custom_divisor = ser.baud_base / baudrate;
+      ser.custom_divisor = ser.baud_base / baudrate_;
       // update flags
       ser.flags &= ~ASYNC_SPD_MASK;
       ser.flags |= ASYNC_SPD_CUST;
 
-      if (ioctl(fd_, TIOCSSERIAL, buf) < 0)
+      if (ioctl(fd_, TIOCSSERIAL, ser) < 0)
       {
         throw IOException (errno);
       }