blob: 8f12f5325e74b6eb0045f4c151daae7a608de22c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From 55e3ac26c1238df4c85877c32763a02c00da1345 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Thu, 30 Apr 2015 13:29:50 +0200
Subject: [PATCH] Fix build when using C99 and C++11
Fix build when using C99 and C++11
Indeed, C99 doesn't have static_assert and C++11 has it.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
include/vlc_fixups.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 997f600d6a..0d4fcd0c8d 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
}
#endif
-#if !defined (HAVE_STATIC_ASSERT)
+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
# define static_assert _Static_assert
#endif
--
2.14.3
|
