From 9eaa6998cc4326e3895159ddae7b20cc5bcf4ed8 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 10 Sep 2016 09:46:02 -0700 Subject: c99_compat.h: Don't try to use 'restrict' in C++ code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes build failures on Solaris in C++ files using gcc: ../src/util/u_math.h:628:41: error: expected ‘,’ or ‘...’ before ‘dest’ 628 | util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t n) | ^~~~ ../src/util/u_math.h: In function ‘void* util_memcpy_cpu_to_le32(void*)’: ../src/util/u_math.h:641:18: error: ‘dest’ was not declared in this scope 641 | return memcpy(dest, src, n); | ^~~~ ../src/util/u_math.h:641:24: error: ‘src’ was not declared in this scope 641 | return memcpy(dest, src, n); | ^~~ ../src/util/u_math.h:641:29: error: ‘n’ was not declared in this scope; did you mean ‘yn’? 641 | return memcpy(dest, src, n); | ^ | yn Signed-off-by: Alan Coopersmith Acked-by: Eric Engestrom (cherry picked from commit ddde652e7000a13e3431316ad9ad7d1237552a0b) --- include/c99_compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/c99_compat.h b/include/c99_compat.h index b681725b2b0..c22e4de8437 100644 --- a/include/c99_compat.h +++ b/include/c99_compat.h @@ -96,7 +96,7 @@ * - http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html */ #ifndef restrict -# if (__STDC_VERSION__ >= 199901L) +# if (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) /* C99 */ # elif defined(__GNUC__) # define restrict __restrict__ -- cgit v1.2.1