Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 4d7032d36975
children e2fae7783046
line wrap: on
line diff
--- a/src/sysdep.c	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/sysdep.c	Fri Feb 27 17:47:15 2015 +0000
@@ -188,11 +188,13 @@
      lowry@watson.ibm.com (Andy Lowry). */
   /* #### Should this be conditionalized on FIONBIO? */
 #if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS)) || defined (AIX)
+#if !defined(WIN32_NATIVE)
   {
     int one = 1;
     ioctl (fd, FIONBIO, &one);
   }
 #endif
+#endif
 
 #ifdef F_SETFL
   fcntl (fd, F_SETFL, O_NONBLOCK);
@@ -495,9 +497,9 @@
   /* <mdiers> What to do upon failure? Just ignoring rc is probably
      not acceptable, is it? */
   if (cfsetispeed (&s.main, B9600) == -1)
-    ;				/* ignore */
+    DO_NOTHING;				/* ignore */
   if (cfsetospeed (&s.main, B9600) == -1)
-    ;				/* ignore */
+    DO_NOTHING;				/* ignore */
 #endif /* defined (CBAUD) */
 
 #else /* not HAVE_TERMIO */