* ntdll.h (SharedUserData): Add volatile qualifier. This fixes a

	possible infinite loop in hires_ms::timeGetTime_ns.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7ce112a229585a3f9c10169b0aadfb0ef8e3f147..63d4c8b366111b563858702a20c9f0df58cd6b60 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-20  Christian Franke  <franke@computer.org>
+
+       * ntdll.h (SharedUserData): Add volatile qualifier. This fixes a
+       possible infinite loop in hires_ms::timeGetTime_ns.
+
+2012-03-20  Corinna Vinschen  <corinna@vinschen.de>
+
+       * include/cygwin/socket.h: Fix definitions of MCAST_INCLUDE and
+       MCAST_EXCLUDE.
+
 2012-03-20  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
        * child_info.h (CURR_CHILD_INFO_MAGIC): Reset.

diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index 0f099241a957c5e5fce27bff52ebc275e78f41be..41c2eb5f8bf630b9d7930cc7feea05226898f6f4 100644 (file)
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -1,6 +1,6 @@
 /* cygwin/socket.h
 
-   Copyright 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2010 Red Hat, Inc.
+   Copyright 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2010, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -269,8 +269,8 @@ struct OLD_msghdr
 #define MCAST_JOIN_SOURCE_GROUP         45
 #define MCAST_LEAVE_SOURCE_GROUP        46
 
-#define MCAST_EXCLUDE                    0
-#define MCAST_INCLUDE                    1
+#define MCAST_INCLUDE                    0
+#define MCAST_EXCLUDE                    1
 
 /* Old WinSock1 values, needed internally */
 #ifdef __INSIDE_CYGWIN__

diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index d921867bdb293dcd66df567069764a2185b71c8d..7eee720aa660a3749e067f830ae407f532357eb6 100644 (file)
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -1106,9 +1106,10 @@ typedef VOID (APIENTRY *PTIMER_APC_ROUTINE)(PVOID, ULONG, ULONG);
 
 #ifdef __cplusplus
 /* This is the mapping of the KUSER_SHARED_DATA structure into the 32 bit
-   user address space.  We need it here to access the current DismountCount. */
-static KUSER_SHARED_DATA &SharedUserData
-                        = *(volatile PKUSER_SHARED_DATA) 0x7ffe0000;
+   user address space.  We need it here to access the current DismountCount
+   and InterruptTime.  */
+static volatile KUSER_SHARED_DATA &SharedUserData
+       = *(volatile KUSER_SHARED_DATA *) 0x7ffe0000;
 
 extern "C"
 {