From 7e432258e619d56f2fc716e5dc0efe07f4c09bab Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Sat, 6 Nov 2004 17:27:45 +0000
Subject: [PATCH] *BSD fixes (tested with OpenBSD) No more need to include
 anything in proto.h on BSDs

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@798 423420c4-83ab-492f-b58f-81f9feb106b5
---
 rdesktop.h | 2 +-
 serial.c   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rdesktop.h b/rdesktop.h
index f8eedf3..ed8e053 100644
--- a/rdesktop.h
+++ b/rdesktop.h
@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
+#include <sys/time.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #else
-#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #endif
diff --git a/serial.c b/serial.c
index 7946391..7a814e5 100644
--- a/serial.c
+++ b/serial.c
@@ -395,16 +395,16 @@ set_termios(SERIAL_DEVICE * pser_inf, NTHANDLE serial_fd)
 			break;
 	}
 
-#if 0
+#ifdef CBAUD
+	ptermios->c_cflag &= ~CBAUD;
+	ptermios->c_cflag |= speed;
+#else
 	/* on systems with separate ispeed and ospeed, we can remember the speed
 	   in ispeed while changing DTR with ospeed */
 	cfsetispeed(pser_inf->ptermios, speed);
 	cfsetospeed(pser_inf->ptermios, pser_inf->dtr ? speed : 0);
 #endif
 
-	ptermios->c_cflag &= ~CBAUD;
-	ptermios->c_cflag |= speed;
-
 	ptermios->c_cflag &= ~(CSTOPB | PARENB | PARODD | CSIZE | CRTSCTS);
 	switch (pser_inf->stop_bits)
 	{