Skip to content

intel,nir: avoid FreeBSD conflict around struct bitset

Jan Beich requested to merge jbeich/mesa:bitset into main

Regressed by !7356 (merged). See error log.

How system struct bitset is bootlegged:

In file included from ../src/intel/compiler/brw_nir_lower_shader_calls.c:24:
In file included from ../src/intel/compiler/brw_nir_rt.h:27:
In file included from ../src/intel/compiler/brw_nir.h:29:
In file included from ../src/intel/compiler/brw_compiler.h:30:
In file included from ../src/mesa/main/mtypes.h:42:
In file included from ../src/mesa/main/glthread.h:51:
In file included from ../src/util/u_queue.h:43:
In file included from ../src/util/u_thread.h:41:
In file included from /usr/include/pthread_np.h:37:
In file included from /usr/include/sys/cpuset.h:37:
In file included from /usr/include/sys/_cpuset.h:37:
/usr/include/sys/_bitset.h:64:2: error: #error BITSET_DEFINE(bitset, 1);

CC @manu, @unrelentingtech

Edited by Jan Beich

Merge request reports