diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /src/Threads.c | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/Threads.c')
| -rw-r--r-- | src/Threads.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Threads.c b/src/Threads.c index 2fca1fb..ef9a3bb 100644 --- a/src/Threads.c +++ b/src/Threads.c @@ -53,6 +53,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Threads.c,v 3.6 2001/12/14 19:56:31 dawes Exp $ */ #include "IntrinsicI.h" @@ -93,7 +94,7 @@ typedef struct _LockRec { static LockPtr process_lock = NULL; static void -InitProcessLock() +InitProcessLock(void) { if(!process_lock) { process_lock = XtNew(LockRec); @@ -109,7 +110,7 @@ InitProcessLock() } static void -ProcessLock() +ProcessLock(void) { #ifdef _XMUTEX_NESTS xmutex_lock(process_lock->mutex); @@ -141,7 +142,7 @@ ProcessLock() } static void -ProcessUnlock() +ProcessUnlock(void) { #ifdef _XMUTEX_NESTS process_lock->level--; @@ -213,7 +214,9 @@ AppUnlock(app) app_lock->level--; xmutex_unlock(app_lock->mutex); #else - xthread_t self = xthread_self(); + xthread_t self; + + self = xthread_self(); xmutex_lock(app_lock->mutex); assert(xthread_equal(app_lock->holder, self)); if (app_lock->level != 0) { |