Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> In general, we should be using mesa compat headers for this sort of thing rather than hand-rolling it. <div class="gmail_quote">On Apr 23, 2016 12:28 AM, "Jonathan Gray" <<a href="mailto:jsg@jsg.id.au">jsg@jsg.id.au</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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 <<a href="mailto:jsg@jsg.id.au">jsg@jsg.id.au</a>> --- 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 7b22259..d98e707 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) { -- 2.8.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div>