Fix usage of recently fixed Interlocked* functions.

* winbase.h (ilockincr, ilockdecr, ilockexch, ilockcmpexch): Add
volatile qualifier, to match Interlocked* functions.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2bb73d0e886295b345f2c49e905a1f417b4d5d2a..31a8657589575745ce201dc0dd8bb9ed2fda27c4 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-12  Eric Blake  <ebb9@byu.net>
+
+       Fix usage of recently fixed Interlocked* functions.
+       * winbase.h (ilockincr, ilockdecr, ilockexch, ilockcmpexch): Add
+       volatile qualifier, to match Interlocked* functions.
+
 2008-07-11  Corinna Vinschen  <corinna@vinschen.de>
 
        * select.cc (peek_pipe): Temporarily revert patch from 2008-05-30.
@@ -246,7 +252,7 @@
        * fhandler_disk_file.cc (fhandler_disk_file::opendir): Don't try to
        use FileIdBothDirectoryInformation on NFS shares.  Fix comment to
        explain why.
-       * path.cc (symlink_info::check): Reinstantiate no_ea.  Use in 
+       * path.cc (symlink_info::check): Reinstantiate no_ea.  Use in
        erroneously changed condition.
 
 2008-05-23  Christopher Faylor  <me+cygwin@cgf.cx>
@@ -385,7 +391,7 @@
 
 2008-05-20  Corinna Vinschen  <corinna@vinschen.de>
 
-       * path.cc (symlink_info::check_shortcut): Minimize requested file 
+       * path.cc (symlink_info::check_shortcut): Minimize requested file
        access flags.
        (symlink_info::check_sysfile): Ditto.  Add missing `else'.
        (symlink_info::check): Only retry to open file if first try failed
@@ -969,7 +975,7 @@
 
 2008-04-07  Corinna Vinschen  <corinna@vinschen.de>
 
-       * postinstall: Set IFS to LF only.  Change while loop in subshell to 
+       * postinstall: Set IFS to LF only.  Change while loop in subshell to
        for loop in parent shell.  Add code to read system mount points and
        system cygdrive prefix from registry and append them to /etc/fstab.
 
@@ -1036,7 +1042,7 @@
 2008-04-03  Corinna Vinschen  <corinna@vinschen.de>
 
        Cleanup.
-       * exceptions.cc (windows_system_directory): Make static.  Convert to 
+       * exceptions.cc (windows_system_directory): Make static.  Convert to
        WCHAR.
        (_cygtls::inside_kernel): Accommodate above change.  Check module
        path name for leading \\?\ and skip, if so.
@@ -2163,4 +2169,3 @@
        (fhandler_pipe::create): Simplify based on above change.
 
        * tty.cc (tty_list::allocate): Remove non-NT code.
-

diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h
index 8e2ea99d52a074581c207e329a79632b45b531f7..18f0be344148d662d62fec42ee565ff1731ebf32 100644 (file)
--- a/winsup/cygwin/winbase.h
+++ b/winsup/cygwin/winbase.h
@@ -1,6 +1,6 @@
 /* winbase.h
 
-   Copyright 2002, 2003, 2004 Red Hat, Inc.
+   Copyright 2002, 2003, 2004, 2008 Red Hat, Inc.
 
 This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
@@ -12,7 +12,7 @@ details. */
 #define _WINBASE2_H
 
 extern __inline__ long
-ilockincr (long *m)
+ilockincr (volatile long *m)
 {
   register int __res;
   __asm__ __volatile__ ("\n\
@@ -24,7 +24,7 @@ ilockincr (long *m)
 }
 
 extern __inline__ long
-ilockdecr (long *m)
+ilockdecr (volatile long *m)
 {
   register int __res;
   __asm__ __volatile__ ("\n\
@@ -36,7 +36,7 @@ ilockdecr (long *m)
 }
 
 extern __inline__ long
-ilockexch (long *t, long v)
+ilockexch (volatile long *t, long v)
 {
   register int __res;
   __asm__ __volatile__ ("\n\
@@ -47,7 +47,7 @@ ilockexch (long *t, long v)
 }
 
 extern __inline__ long
-ilockcmpexch (long *t, long v, long c)
+ilockcmpexch (volatile long *t, long v, long c)
 {
   register int __res;
   __asm__ __volatile__ ("\n\