diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2016-09-10 09:46:02 -0700 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2019-10-16 14:46:47 +0000 |
| commit | 9eaa6998cc4326e3895159ddae7b20cc5bcf4ed8 (patch) | |
| tree | 4cf67b046fa5704a1a01dfbb4ec0005f9384e2a6 | |
| parent | e56b3afd2dbb16356dd573f5213976f137439b36 (diff) | |
| download | mesa-9eaa6998cc4326e3895159ddae7b20cc5bcf4ed8.tar.gz | |
c99_compat.h: Don't try to use 'restrict' in C++ code
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 <alan.coopersmith@oracle.com>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
(cherry picked from commit ddde652e7000a13e3431316ad9ad7d1237552a0b)
| -rw-r--r-- | include/c99_compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
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__ |