* ntdll.h (SharedUserData): Add volatile qualifier. This fixes a
possible infinite loop in hires_ms::timeGetTime_ns.
This commit is contained in:
parent
1fb6667f1c
commit
8ea7221511
|
@ -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.
|
||||
|
|
|
@ -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__
|
||||
|
|
|
@ -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"
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue