diff options
| author | Michael Forney <mforney@mforney.org> | 2020-01-31 21:47:46 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-02-01 01:37:46 -0800 |
| commit | 62d6e9b0f0219d45426d460e2c89289ea9c24cce (patch) | |
| tree | 6cace3381f4f744a8fd7f84b52fb3363d4cd5ccf /pkg/libevdev | |
| parent | 8f1395fd11aa03bad909eb5f865d3efe5cbb066a (diff) | |
libevdev: Remove patch avoiding __builtin_expect
cproc now implements this built-in.
Diffstat (limited to 'pkg/libevdev')
| -rw-r--r-- | pkg/libevdev/patch/0004-Only-use-__builtin_expect-on-GNU-compatible-compiler.patch | 28 | ||||
| -rw-r--r-- | pkg/libevdev/ver | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/pkg/libevdev/patch/0004-Only-use-__builtin_expect-on-GNU-compatible-compiler.patch b/pkg/libevdev/patch/0004-Only-use-__builtin_expect-on-GNU-compatible-compiler.patch deleted file mode 100644 index 9e78440a..00000000 --- a/pkg/libevdev/patch/0004-Only-use-__builtin_expect-on-GNU-compatible-compiler.patch +++ /dev/null @@ -1,28 +0,0 @@ -From be5f47aa16b42f1867d832e89b510088538b4c32 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 16 Jun 2019 17:18:21 -0700 -Subject: [PATCH] Only use __builtin_expect on GNU-compatible compilers - ---- - libevdev/libevdev-util.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libevdev/libevdev-util.h b/libevdev/libevdev-util.h -index e8b6769..c7f90b9 100644 ---- a/libevdev/libevdev-util.h -+++ b/libevdev/libevdev-util.h -@@ -30,7 +30,11 @@ - #define LONG_BITS (sizeof(long) * 8) - #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) - #define ARRAY_LENGTH(a) (sizeof(a) / (sizeof((a)[0]))) -+#ifdef __GNUC__ - #define unlikely(x) (__builtin_expect(!!(x),0)) -+#else -+#define unlikely(x) (x) -+#endif - - static inline bool - startswith(const char *str, size_t len, const char *prefix, size_t plen) --- -2.20.1 - diff --git a/pkg/libevdev/ver b/pkg/libevdev/ver index f9861646..7d654f02 100644 --- a/pkg/libevdev/ver +++ b/pkg/libevdev/ver @@ -1 +1 @@ -1.8.0 r0 +1.8.0 r1 |