CVS: rdesktop rdesktop.h,1.24,1.25 serial.c,1.22,1.23

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30367

Modified Files:
	rdesktop.h serial.c 
Log Message:
*BSD fixes (tested with OpenBSD)
No more need to include anything in proto.h on BSDs


Index: rdesktop.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** rdesktop.h	6 Nov 2004 15:29:38 -0000	1.24
--- rdesktop.h	6 Nov 2004 17:27:45 -0000	1.25
***************
*** 23,30 ****
  #include <string.h>
  #include <dirent.h>
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #else
- #include <sys/time.h>
  #include <sys/types.h>
  #include <unistd.h>
--- 23,30 ----
  #include <string.h>
  #include <dirent.h>
+ #include <sys/time.h>
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #else
  #include <sys/types.h>
  #include <unistd.h>

Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** serial.c	6 Nov 2004 15:29:38 -0000	1.22
--- serial.c	6 Nov 2004 17:27:45 -0000	1.23
***************
*** 396,400 ****
  	}
  
! #if 0
  	/* on systems with separate ispeed and ospeed, we can remember the speed
  	   in ispeed while changing DTR with ospeed */
--- 396,403 ----
  	}
  
! #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 */
***************
*** 403,409 ****
  #endif
  
- 	ptermios->c_cflag &= ~CBAUD;
- 	ptermios->c_cflag |= speed;
- 
  	ptermios->c_cflag &= ~(CSTOPB | PARENB | PARODD | CSIZE | CRTSCTS);
  	switch (pser_inf->stop_bits)
--- 406,409 ----



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click