X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_thread_safe_nt.c;h=e0dad45a565f8acacf40c6c17afd8b6ca28be816;hp=1115b99901d7927e0689fe84352daf9f7790f7a3;hb=d4110e29da41ce702bcc3327e86768c6f266915e;hpb=c24cf5317f753d0bfb376835b4f907462a770384 diff --git a/src/rrd_thread_safe_nt.c b/src/rrd_thread_safe_nt.c index 1115b99..e0dad45 100644 --- a/src/rrd_thread_safe_nt.c +++ b/src/rrd_thread_safe_nt.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3rc9 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL @@ -38,7 +38,7 @@ static void context_destroy_context( static void context_init_context( void) { - if (!InterlockedExchange(&context_key_once, 1)) { + if (!InterlockedExchange((LONG*)(&context_key_once), 1)) { context_key = TlsAlloc(); InitializeCriticalSection(&CriticalSection); atexit(context_destroy_context); @@ -51,7 +51,7 @@ rrd_context_t *rrd_get_context( context_init_context(); - ctx = TlsGetValue(context_key); + ctx = (rrd_context_t*)TlsGetValue(context_key); if (!ctx) { ctx = rrd_new_context(); TlsSetValue(context_key, ctx); @@ -59,6 +59,23 @@ rrd_context_t *rrd_get_context( return ctx; } + +/* this was added by the win32 porters Christof.Wegmann@exitgames.com */ + +rrd_context_t *rrd_force_new_context( + void) +{ + rrd_context_t *ctx; + + context_init_context(); + + ctx = rrd_new_context(); + TlsSetValue(context_key, ctx); + + return ctx; +} + + #undef strerror const char *rrd_strerror( int err)