diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2016-04-23 17:27:58 +1000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-04-25 15:06:46 +0100 |
| commit | 3c8f9ed9b7fd4462bae66685bf2389f4802dc84e (patch) | |
| tree | a27b154395cbf1229065d0b891730ce707516498 | |
| parent | dc732a8ef29dd2308a435cb7827c00be6d37fb5b (diff) | |
isl: remove ffs function that conflicts with system headers
Remove a wrapper around __builtin_ffs that conflicts with system
headers on OpenBSD and perhaps elsewhere:
isl_priv.h:44: error: conflicting types for 'ffs'
v2: include strings.h to ensure prototype is found
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | src/intel/isl/isl_priv.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index 7b222594fd4..d98e7079541 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -24,6 +24,7 @@ #pragma once #include <assert.h> +#include <strings.h> #include "brw_device_info.h" #include "util/macros.h" @@ -39,11 +40,6 @@ __isl_finishme(const char *file, int line, const char *fmt, ...); #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) -static inline uint32_t -ffs(uint32_t n) { - return __builtin_ffs(n); -} - static inline bool isl_is_pow2(uintmax_t n) { |