* flock.cc (inode_t::get_all_locks_list): Fix typo.

	* posix.sgml: Add cfmakeraw to list of implemented BSD functions.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f280ce3..176c17a 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-29  Corinna Vinschen  <corinna@vinschen.de>
+
+       * flock.cc (inode_t::get_all_locks_list): Fix typo.
+       * posix.sgml: Add cfmakeraw to list of implemented BSD functions.
+
 2008-09-19  Eric Blake  <ebb9@byu.net>
 
        * errno.cc (_sys_errlist): Add ECANCELED, ENOTRECOVERABLE,

diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc
index b69a304..24907b6 100644 (file)
--- a/winsup/cygwin/flock.cc
+++ b/winsup/cygwin/flock.cc
@@ -500,7 +500,7 @@ inode_t::get_all_locks_list ()
          || ((flags & (F_FLOCK | F_POSIX)) == (F_FLOCK | F_POSIX)))
        continue;
       short type = wcstol (endptr + 1, &endptr, 16);
-      if (type != (F_RDLCK && type != F_WRLCK) || !endptr || *endptr != L'-')
+      if ((type != F_RDLCK && type != F_WRLCK) || !endptr || *endptr != L'-')
         continue;
       _off64_t start = (_off64_t) wcstoull (endptr + 1, &endptr, 16);
       if (start < 0 || !endptr || *endptr != L'-')

diff --git a/winsup/cygwin/posix.sgml b/winsup/cygwin/posix.sgml
index ca9e0cf..707ac9c 100644 (file)
--- a/winsup/cygwin/posix.sgml
+++ b/winsup/cygwin/posix.sgml
@@ -834,6 +834,7 @@ also ISO/IEC 9945:2003 and IEEE Std 1003.1-2001 (POSIX.1-2001).</para>
     alphasort
     bindresvport
     bindresvport_sa
+    cfmakeraw
     daemon
     dn_comp
     dn_expand