atomic.patch

   1 From: Steve Lhomme <robux4@videolabs.io>
   2 Date: Thu, 9 Jun 2016 16:53:20 +0000 (+0200)
   3 Subject: vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters
   4 X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=ea4edfb6aec493a8268b55d843729e5f0be52e04
   5
   6 vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 parameters
   7
   8 Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
   9 ---
  10
  11 diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
  12 index ef0a1ee..e003f6d 100644
  13 --- a/include/vlc_atomic.h
  14 +++ b/include/vlc_atomic.h
  15 @@ -144,7 +144,7 @@ typedef         uintmax_t atomic_uintmax_t;
  16  #  define atomic_compare_exchange_weak(object,expected,desired) \
  17      atomic_compare_exchange(object, expected, desired)
  18
  19 -#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \
  20 +#  define atomic_compare_exchange_weak_explicit(object,expected,desired,order_equal,order_different) \
  21      atomic_compare_exchange_weak(object, expected, desired)
  22
  23  #  define atomic_fetch_add(object,operand) \
  24 From 54bda02c8340298b0d6956cf4ad0423c09fc046e Mon Sep 17 00:00:00 2001
  25 From: Francois Cartegnie <fcvlcdev@free.fr>
  26 Date: Fri, 22 Jul 2016 13:03:10 +0200
  27 Subject: [PATCH] vlc_atomic: atomic_compare_exchange_strong_explicit takes 5
  28  parameters
  29
  30 ---
  31  include/vlc_atomic.h | 2 +-
  32  1 file changed, 1 insertion(+), 1 deletion(-)
  33
  34 diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
  35 index e003f6d..39e3347 100644
  36 --- a/include/vlc_atomic.h
  37 +++ b/include/vlc_atomic.h
  38 @@ -138,7 +138,7 @@ typedef         uintmax_t atomic_uintmax_t;
  39  #  define atomic_compare_exchange_strong(object,expected,desired) \
  40      atomic_compare_exchange(object, expected, desired)
  41
  42 -#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \
  43 +#  define atomic_compare_exchange_strong_explicit(object,expected,desired,order,order_different) \
  44      atomic_compare_exchange_strong(object, expected, desired)
  45
  46  #  define atomic_compare_exchange_weak(object,expected,desired) \
  47 --
  48 2.1.4
  49