From 3c8f9ed9b7fd4462bae66685bf2389f4802dc84e Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sat, 23 Apr 2016 17:27:58 +1000 Subject: [PATCH] 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 Reviewed-by: Jason Ekstrand Reviewed-by: Emil Velikov --- src/intel/isl/isl_priv.h | 6 +----- 1 file changed, 1 insertion(+), 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 +#include #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) { -- 2.30.2