From cb058f64f2500e7cc809d8a171c5d20dee3a3aac Mon Sep 17 00:00:00 2001
From: Thomas Bonfort <thomas.bonfort@gmail.com>
Date: Fri, 29 Jun 2012 13:18:45 +0200
Subject: [PATCH 1/2] update for 6.2.0-beta1

---
 HISTORY.TXT | 2 +-
 mapserver.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HISTORY.TXT b/HISTORY.TXT
index a17348b245..7448b3652c 100644
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -11,7 +11,7 @@ the top of the list.)
 
 For a complete change history, please see the Git log comments.
 
-Current Version (git master, 6.1-dev, future 6.2): 
+Version 6.2.0-beta1 (2012-06-29):
 -------------------------------------------------
 
 - Fix WFS filter is produced as non-standard XML (#4171)
diff --git a/mapserver.h b/mapserver.h
index d2fca82ac1..5dd21a8ec0 100644
--- a/mapserver.h
+++ b/mapserver.h
@@ -32,10 +32,10 @@
 /*
 ** MapServer version - to be updated for every release
 */
-#define MS_VERSION "6.1-dev"
+#define MS_VERSION "6.2.0-beta1"
 
 #define MS_VERSION_MAJOR    6
-#define MS_VERSION_MINOR    1
+#define MS_VERSION_MINOR    2
 #define MS_VERSION_REV      0
 
 #define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)

From 8e4df01a684dc3b1703a8d77da30764454ca4355 Mon Sep 17 00:00:00 2001
From: Umberto Nicoletti <umberto.nicoletti@gmail.com>
Date: Mon, 2 Jul 2012 12:30:53 +0200
Subject: [PATCH 2/2] (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