From 8e4df01a684dc3b1703a8d77da30764454ca4355 Mon Sep 17 00:00:00 2001 From: Umberto Nicoletti Date: Mon, 2 Jul 2012 12:30:53 +0200 Subject: [PATCH] (backported from master) Error in new refcounting locking code: restore project build also when thread support is disabled --- mapserver.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mapserver.h b/mapserver.h index 5dd21a8ec0..6fe89967d2 100644 --- a/mapserver.h +++ b/mapserver.h @@ -441,12 +441,11 @@ extern "C" { #define GET_LAYER(map, pos) map->layers[pos] #define GET_CLASS(map, lid, cid) map->layers[lid]->class[cid] -#if defined(USE_THREAD) && defined(HAVE_SYNC_FETCH_AND_ADD) +#if defined(HAVE_SYNC_FETCH_AND_ADD) #define MS_REFCNT_INCR(obj) __sync_fetch_and_add(&obj->refcount, +1) #define MS_REFCNT_DECR(obj) __sync_sub_and_fetch(&obj->refcount, +1) #define MS_REFCNT_INIT(obj) obj->refcount=1, __sync_synchronize() -#elif defined(USE_THREAD) -#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) +#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) #pragma intrinsic (_InterlockedExchangeAdd) #if defined(_MSC_VER) && (_MSC_VER <= 1200) #define MS_REFCNT_INCR(obj) ( _InterlockedExchangeAdd((long*)(&obj->refcount), (long)(+1)) +1 ) @@ -467,14 +466,11 @@ extern "C" { #define MS_REFCNT_DECR(obj) (--(obj->refcount)) #define MS_REFCNT_INIT(obj) obj->refcount=1 #endif // close if defined(_MSC.. -#endif // close elif -#if defined(USE_THREAD) #define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0 #define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0 #define MS_IS_VALID_ARRAY_INDEX(index, size) ((index<0 || index>=size)?MS_FALSE:MS_TRUE) -#endif #endif