diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 13:44:36 +0400 |
commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/thread.h | |
parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/thread.h')
-rw-r--r-- | winsup/cygwin/thread.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h index 71f301258..c87c620eb 100644 --- a/winsup/cygwin/thread.h +++ b/winsup/cygwin/thread.h @@ -92,7 +92,7 @@ class pinfo; #define MUTEX_OWNER_ANONYMOUS ((pthread_t) -1) -typedef unsigned long thread_magic_t; +typedef uint32_t thread_magic_t; /* verifyable_object should not be defined here - it's a general purpose class */ @@ -496,8 +496,8 @@ public: int shared; clockid_t clock_id; - unsigned long waiting; - unsigned long pending; + LONG waiting; + LONG pending; HANDLE sem_wait; pthread_mutex mtx_in; @@ -547,14 +547,14 @@ public: int shared; - unsigned long waiting_readers; - unsigned long waiting_writers; + uint32_t waiting_readers; + uint32_t waiting_writers; pthread_t writer; struct RWLOCK_READER { struct RWLOCK_READER *next; pthread_t thread; - unsigned long n; + uint32_t n; RWLOCK_READER (): next (NULL), thread (pthread::self ()), n (0) {} } *readers; fast_mutex readers_mx; @@ -637,7 +637,7 @@ public: HANDLE win32_obj_id; int shared; - long currentvalue; + LONG currentvalue; int fd; unsigned long long hash; LUID luid; |