contrib/zvbi: fix compilation with clang
[vlc/vlc-acra.git] / contrib / src / zvbi / zvbi-fix-clang-support.patch
blobca83c55ccd11ac0ca3a866f09283fbf3abed2ec8
1 diff -ru zvbi/src/misc.h zvbi-fixed/src/misc.h
2 --- zvbi/src/misc.h 2013-07-02 04:32:31.000000000 +0200
3 +++ zvbi-fixed/src/misc.h 2013-08-08 21:37:22.000000000 +0200
4 @@ -52,17 +52,6 @@
5 # define unlikely(expr) __builtin_expect(expr, 0)
6 #endif
8 -#undef __i386__
9 -#undef __i686__
10 -/* FIXME #cpu is deprecated
11 -#if #cpu (i386)
12 -# define __i386__ 1
13 -#endif
14 -#if #cpu (i686)
15 -# define __i686__ 1
16 -#endif
17 -*/
19 /* &x == PARENT (&x.tm_min, struct tm, tm_min),
20 safer than &x == (struct tm *) &x.tm_min. A NULL _ptr is safe and
21 will return NULL, not -offsetof(_member). */
22 @@ -156,8 +145,6 @@
24 #define likely(expr) (expr)
25 #define unlikely(expr) (expr)
26 -#undef __i386__
27 -#undef __i686__
29 static char *
30 PARENT_HELPER (char *p, unsigned int offset)