- rebuild with gnutls 3.5

[packages/vlc.git] / atomic.patch

From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 9 Jun 2016 16:53:20 +0000 (+0200)
Subject: vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters
X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=ea4edfb6aec493a8268b55d843729e5f0be52e04

vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---

diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index ef0a1ee..e003f6d 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -144,7 +144,7 @@ typedef         uintmax_t atomic_uintmax_t;
 #  define atomic_compare_exchange_weak(object,expected,desired) \
     atomic_compare_exchange(object, expected, desired)
 
-#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \
+#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order_equal,order_different) \
     atomic_compare_exchange_weak(object, expected, desired)
 
 #  define atomic_fetch_add(object,operand) \
From 54bda02c8340298b0d6956cf4ad0423c09fc046e Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Fri, 22 Jul 2016 13:03:10 +0200
Subject: [PATCH] vlc_atomic: atomic_compare_exchange_strong_explicit takes 5
 parameters

---
 include/vlc_atomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index e003f6d..39e3347 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -138,7 +138,7 @@ typedef         uintmax_t atomic_uintmax_t;
 #  define atomic_compare_exchange_strong(object,expected,desired) \
     atomic_compare_exchange(object, expected, desired)
 
-#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \
+#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order,order_different) \
     atomic_compare_exchange_strong(object, expected, desired)
 
 #  define atomic_compare_exchange_weak(object,expected,desired) \
-- 
2.1.4