On Sat, Apr 16, 2016 at 12:45 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote: > C++ doesn't define the "restrict" keyword so g++ barfs when it sees isl.h. > Having our own define lets us define it to be a no-op for C++. > --- > src/intel/isl/isl.h | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h > index 8f796b0..33d43d7 100644 > --- a/src/intel/isl/isl.h > +++ b/src/intel/isl/isl.h > @@ -47,6 +47,16 @@ > extern "C" { > #endif > > +/* The restrict keyword is simply a hint to the optimizer and doesn't affect > + * the caller of a function in any way. We want it in the header for the > sake > + * of documentation but we can safely remove it to make C++ happy. > + */ > +#ifdef __cplusplus > +#define ISL_RESTRICT > +#else > +#define ISL_RESTRICT restrict > +#endif
Don't you just want __restrict? https://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html Maybe even just #define restrict __restrict _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev