[SCM] beast/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c81f48c18cad275bf0bfcf4058f1def5a3329cd
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 6 17:06:04 2011 +0200

    Refresh

diff --git a/debian/patches/210_volatile.diff b/debian/patches/210_volatile.diff
index 9a84d1a..1386323 100644
--- a/debian/patches/210_volatile.diff
+++ b/debian/patches/210_volatile.diff
@@ -2,16 +2,18 @@ Description: Correct signature for the g_atomic_pointer_get() function.
 Author: Jakub Wilk <ubanus at users.sf.net>
 Bug-Debian: http://bugs.debian.org/540681
 
-Index: beast-0.7.1/birnet/birnetthreadimpl.cc
-===================================================================
---- beast-0.7.1.orig/birnet/birnetthreadimpl.cc	2009-12-16 20:21:24.000000000 +0100
-+++ beast-0.7.1/birnet/birnetthreadimpl.cc	2009-12-16 20:26:16.000000000 +0100
-@@ -1491,7 +1491,7 @@
+---
+ birnet/birnetthreadimpl.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- beast.orig/birnet/birnetthreadimpl.cc
++++ beast/birnet/birnetthreadimpl.cc
+@@ -1489,7 +1489,7 @@ birnet_g_atomic_int_get (volatile int *a
  
  #ifdef g_atomic_pointer_get
  static void*
--(g_atomic_pointer_get) (volatile void **atomic)
-+(g_atomic_pointer_get) (void * volatile *atomic)
+-birnet_g_atomic_pointer_get (volatile void **atomic)
++birnet_g_atomic_pointer_get (void * volatile *atomic)
  {
    return (void*) g_atomic_pointer_get (atomic);
  }

-- 
beast packaging