comparison src/sysdep.c @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 4d7032d36975
children e2fae7783046
comparison
equal deleted inserted replaced
5921:68639fb08af8 5922:4b055de36bb9
186 /* For AIX: Apparently need this for non-blocking reads on sockets. 186 /* For AIX: Apparently need this for non-blocking reads on sockets.
187 It seems that O_NONBLOCK applies only to FIFOs? From 187 It seems that O_NONBLOCK applies only to FIFOs? From
188 lowry@watson.ibm.com (Andy Lowry). */ 188 lowry@watson.ibm.com (Andy Lowry). */
189 /* #### Should this be conditionalized on FIONBIO? */ 189 /* #### Should this be conditionalized on FIONBIO? */
190 #if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS)) || defined (AIX) 190 #if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS)) || defined (AIX)
191 #if !defined(WIN32_NATIVE)
191 { 192 {
192 int one = 1; 193 int one = 1;
193 ioctl (fd, FIONBIO, &one); 194 ioctl (fd, FIONBIO, &one);
194 } 195 }
196 #endif
195 #endif 197 #endif
196 198
197 #ifdef F_SETFL 199 #ifdef F_SETFL
198 fcntl (fd, F_SETFL, O_NONBLOCK); 200 fcntl (fd, F_SETFL, O_NONBLOCK);
199 #endif 201 #endif
493 s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */ 495 s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
494 #else 496 #else
495 /* <mdiers> What to do upon failure? Just ignoring rc is probably 497 /* <mdiers> What to do upon failure? Just ignoring rc is probably
496 not acceptable, is it? */ 498 not acceptable, is it? */
497 if (cfsetispeed (&s.main, B9600) == -1) 499 if (cfsetispeed (&s.main, B9600) == -1)
498 ; /* ignore */ 500 DO_NOTHING; /* ignore */
499 if (cfsetospeed (&s.main, B9600) == -1) 501 if (cfsetospeed (&s.main, B9600) == -1)
500 ; /* ignore */ 502 DO_NOTHING; /* ignore */
501 #endif /* defined (CBAUD) */ 503 #endif /* defined (CBAUD) */
502 504
503 #else /* not HAVE_TERMIO */ 505 #else /* not HAVE_TERMIO */
504 506
505 s.main.sg_flags &= ~(ECHO | CRMOD | ANYP | ALLDELAY | RAW | LCASE 507 s.main.sg_flags &= ~(ECHO | CRMOD | ANYP | ALLDELAY | RAW | LCASE