diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-10 22:36:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-10 22:38:23 +0200 |
| commit | 0053a1525256542fbb9bdee414ad9ebc4bb0b985 (patch) | |
| tree | 9bcc9c49d4b951c7642117eb800d7a6ce5014f5a /package/vlc/patches/patch-include_vlc_fixups_h | |
| parent | 3f9c5dc37aa5785aaffc9ab4101428bad3489f9f (diff) | |
vlc: update to 2.2.6
Diffstat (limited to 'package/vlc/patches/patch-include_vlc_fixups_h')
| -rw-r--r-- | package/vlc/patches/patch-include_vlc_fixups_h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package/vlc/patches/patch-include_vlc_fixups_h b/package/vlc/patches/patch-include_vlc_fixups_h index 229bda74e..968f8d8eb 100644 --- a/package/vlc/patches/patch-include_vlc_fixups_h +++ b/package/vlc/patches/patch-include_vlc_fixups_h @@ -1,10 +1,12 @@ ---- vlc-2.2.4.orig/include/vlc_fixups.h 2015-02-24 17:58:52.000000000 +0100 -+++ vlc-2.2.4/include/vlc_fixups.h 2016-09-27 12:44:22.190862957 +0200 -@@ -240,7 +240,9 @@ static inline locale_t newlocale(int mas +--- vlc-2.2.6.orig/include/vlc_fixups.h 2015-04-13 21:54:35.000000000 +0200 ++++ vlc-2.2.6/include/vlc_fixups.h 2017-06-06 22:56:59.837313883 +0200 +@@ -239,8 +239,10 @@ static inline locale_t newlocale(int mas + } #endif - #if !defined (HAVE_STATIC_ASSERT) +-#if !defined (HAVE_STATIC_ASSERT) -# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) ++#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) +# define STATIC_ASSERT_CONCAT_(a, b) a##b +# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b) +# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })] |