*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

@@ -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

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)
 	{