CVS: rdesktop disk.c,1.32,1.33 serial.c,1.17,1.18

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

Modified Files:
	disk.c serial.c 
Log Message:
fix solaris compile...


Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** disk.c	25 Aug 2004 09:48:11 -0000	1.32
--- disk.c	25 Aug 2004 15:42:42 -0000	1.33
***************
*** 32,36 ****
  #include <time.h>		/* ctime */
  
! #if (defined(HAVE_DIRFD) || defined(HAVE_DECL_DIRFD))
  #define DIRFD(a) (dirfd(a))
  #else
--- 32,36 ----
  #include <time.h>		/* ctime */
  
! #if (defined(HAVE_DIRFD) || (HAVE_DECL_DIRFD == 1))
  #define DIRFD(a) (dirfd(a))
  #else

Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** serial.c	25 Aug 2004 00:43:48 -0000	1.17
--- serial.c	25 Aug 2004 15:42:42 -0000	1.18
***************
*** 446,451 ****
  	tcsetattr(serial_fd, TCSANOW, ptermios);
  */
  
- 	cfmakeraw(pser_inf->ptermios);
  	*handle = serial_fd;
  
--- 446,456 ----
  	tcsetattr(serial_fd, TCSANOW, ptermios);
  */
+ 	pser_inf->ptermios->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+ 	pser_inf->ptermios->c_oflag &= ~OPOST;
+ 	pser_inf->ptermios->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+ 	pser_inf->ptermios->c_cflag &= ~(CSIZE|PARENB);
+ 	pser_inf->ptermios->c_cflag |= CS8;
+ 	tcsetattr(serial_fd, TCSANOW, pser_inf->ptermios);
  
  	*handle = serial_fd;
  



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285