[SCM] Multiplatform 3D Game Development Kit branch, master, updated. debian/1.2.1-1-3-g65347ca

[Gonéri Le Bouder]

The following commit has been merged in the master branch:
commit 65347cac22fe5724a6905a564ced1cd7615952f7
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Wed Jul 8 00:11:19 2009 +0200

    CompareAndSet doesn't return unset value on SPARC

diff --git a/debian/changelog b/debian/changelog
index 4dc6baf..978644c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ crystalspace (1.2.1-1.1) unstable; urgency=low
   * Drop --enable-new-renderer since it doesn't exist anymore
   * Pass CFLAGS as a env var, config.mak is not sourced anymore during the
     build (Closes: #524764)
+  * CompareAndSet doesn't return an undef value on SPARC anymore
+    + add sparc_defined_prev_in_CompareAndSet.diff 
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 07 Jun 2009 17:03:06 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 28a4ae6..b532ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 csstartme_startme_cfg_programs.diff
+sparc_defined_prev_in_CompareAndSet.diff
diff --git a/debian/patches/sparc_defined_prev_in_CompareAndSet.diff b/debian/patches/sparc_defined_prev_in_CompareAndSet.diff
new file mode 100644
index 0000000..4fea676
--- /dev/null
+++ b/debian/patches/sparc_defined_prev_in_CompareAndSet.diff
@@ -0,0 +1,13 @@
+diff --git a/CS/include/csutil/threading/atomicops_sparc.h b/CS/include/csutil/threading/atomicops_sparc.h
+index de1d216..323a18c 100644
+--- a/CS/include/csutil/threading/atomicops_sparc.h
++++ b/CS/include/csutil/threading/atomicops_sparc.h
+@@ -47,7 +47,7 @@ namespace Threading
+     inline static int32 CompareAndSet (int32* target, int32 value,
+       int32 comparand)
+     {
+-      int32 prev;
++      int32 prev = *target;
+ 
+       __asm__ __volatile__ 
+         (

-- 
Multiplatform 3D Game Development Kit