| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 1 | Things break with overlapping defines between glib and gstreamer with glibc 2.30. |
| 2 | |
| 3 | Discussion in the link below, basically internal __ prefixed variables |
| 4 | shouldn't be redefined. |
| 5 | |
| 6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/635] |
| 7 | RP 2019/8/6 |
| 8 | |
| 9 | Index: gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h |
| 10 | =================================================================== |
| 11 | --- gst-plugins-good-1.16.0.orig/sys/v4l2/ext/types-compat.h |
| 12 | +++ gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h |
| 13 | @@ -24,29 +24,6 @@ |
| 14 | #ifndef __TYPES_COMPAT_H__ |
| 15 | #define __TYPES_COMPAT_H__ |
| 16 | |
| 17 | -/* From linux/types.h */ |
| 18 | -#ifndef __bitwise__ |
| 19 | -# ifdef __CHECKER__ |
| 20 | -# define __bitwise__ __attribute__((bitwise)) |
| 21 | -# else |
| 22 | -# define __bitwise__ |
| 23 | -# endif |
| 24 | -#endif |
| 25 | - |
| 26 | -#ifndef __bitwise |
| 27 | -# ifdef __CHECK_ENDIAN__ |
| 28 | -# define __bitwise __bitwise__ |
| 29 | -# else |
| 30 | -# define __bitwise |
| 31 | -# endif |
| 32 | -#endif |
| 33 | - |
| 34 | -#define __u64 guint64 |
| 35 | -#define __u32 guint32 |
| 36 | -#define __u16 guint16 |
| 37 | -#define __u8 guint8 |
| 38 | -#define __s64 gint64 |
| 39 | -#define __s32 gint32 |
| 40 | -#define __le32 guint32 __bitwise |
| 41 | +#include <linux/types.h> |
| 42 | |
| 43 | #endif /* __TYPES_COMPAT_H__ */ |