From 4ea137e8877a18dbd930762a4af6beda7f8b0343 Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Sat, 2 Jul 2005 14:06:10 +0000 Subject: [PATCH] (empth_init) [_WIN32]: Change flags to global_flags to prevent scope conflict with the parameter flags. --- src/lib/empthread/ntthread.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c index 46e46605..752d2877 100644 --- a/src/lib/empthread/ntthread.c +++ b/src/lib/empthread/ntthread.c @@ -135,7 +135,7 @@ static unsigned long ulTickAtStart; static void **ppvUserData; /* Global flags. From empth_init parameter. */ -static int flags; +static int global_flags; /************************ @@ -153,7 +153,7 @@ loc_debug(const char *pszFmt, ...) empth_t *pThread = TlsGetValue(dwTLSIndex); char buf[1024]; - if ((flags & EMPTH_PRINT) != 0) { + if ((global_flags & EMPTH_PRINT) != 0) { /* Ticks are in milliseconds */ ulCurTick = GetTickCount(); @@ -356,7 +356,7 @@ empth_init(void **ctx_ptr, int flags) ulTickAtStart = GetTickCount(); ppvUserData = ctx_ptr; - flags = flags; + global_flags = flags; dwTLSIndex = TlsAlloc(); /* Create the thread mutex sem. */