diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-05-22 20:55:55 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-05-22 20:55:55 +0400 |
| commit | c20a5e603a4b4a30083752145aaad48cb55ab712 (patch) | |
| tree | 06367155fc01f74d69bf1df560712c26eb215cd5 | |
| parent | 7dfacd3869cb46ab0755fa1680d51f0e4ad8561b (diff) | |
* spinlock.h (ULONG): Replace LONG operator with ULONG to accommodate
the fact that CURR_SHARED_MAGIC and USER_SHARED_MAGIC are unsigned
values.
* shared.cc (shared_info::initialize): Drop explicit cast here.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/spinlock.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fec380deb..ff3a31f8f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2013-05-22 Corinna Vinschen <corinna@vinschen.de> + + * spinlock.h (ULONG): Replace LONG operator with ULONG to accommodate + the fact that CURR_SHARED_MAGIC and USER_SHARED_MAGIC are unsigned + values. + * shared.cc (shared_info::initialize): Drop explicit cast here. + 2013-05-21 Corinna Vinschen <corinna@vinschen.de> * Makefile.in (DLL_OFILES): Add arc4random.o. diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 17f84c29d..9cc84593c 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -335,7 +335,7 @@ shared_info::initialize () debug_printf ("Installation root: <%W> key: <%S>", cygheap->installation_root, &cygheap->installation_key); } - else if (sversion != (LONG) CURR_SHARED_MAGIC) + else if (sversion != CURR_SHARED_MAGIC) sversion.multiple_cygwin_problem ("system shared memory version", sversion, CURR_SHARED_MAGIC); else if (cb != sizeof (*this)) diff --git a/winsup/cygwin/spinlock.h b/winsup/cygwin/spinlock.h index b55817245..e43d19c88 100644 --- a/winsup/cygwin/spinlock.h +++ b/winsup/cygwin/spinlock.h @@ -67,7 +67,7 @@ public: } } ~spinlock () {done (setto);} - operator LONG () const {return val;} + operator ULONG () const {return (ULONG) val;} /* FIXME: This should be handled in a more general fashion, probably by establishing a linked list of spinlocks which are freed on process exit. */ void multiple_cygwin_problem (const char *w, unsigned m, unsigned v) |