summaryrefslogtreecommitdiff
path: root/package/vlc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-27 17:13:00 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-27 17:16:44 +0200
commit7cf6386b2404150eac8da0b939f639ddf383cdaa (patch)
tree44d2e5e4516e059d5194986a6f9317257d8f7a87 /package/vlc
parenta8504f6db7423277065e8ea4156742d0e312d852 (diff)
vlc: fix compile issue
Diffstat (limited to 'package/vlc')
-rw-r--r--package/vlc/patches/patch-include_vlc_fixups_h19
1 files changed, 9 insertions, 10 deletions
diff --git a/package/vlc/patches/patch-include_vlc_fixups_h b/package/vlc/patches/patch-include_vlc_fixups_h
index f9ff68fdf..229bda74e 100644
--- a/package/vlc/patches/patch-include_vlc_fixups_h
+++ b/package/vlc/patches/patch-include_vlc_fixups_h
@@ -1,14 +1,13 @@
--- 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-24 20:58:19.747228936 +0200
-@@ -239,11 +239,6 @@ static inline locale_t newlocale(int mas
- }
++++ 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
#endif
--#if !defined (HAVE_STATIC_ASSERT)
+ #if !defined (HAVE_STATIC_ASSERT)
-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
--# define static_assert _Static_assert
--#endif
--
- /* Alignment of critical static data structures */
- #ifdef ATTRIBUTE_ALIGNED_MAX
- # define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
++# 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); })]
+ # define static_assert _Static_assert
+ #endif
+