Mesa (master): c99_compat.h: Don't try to use 'restrict' in C++ code
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Oct 16 12:47:29 UTC 2019
Module: Mesa
Branch: master
Commit: ddde652e7000a13e3431316ad9ad7d1237552a0b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddde652e7000a13e3431316ad9ad7d1237552a0b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Sep 10 09:46:02 2016 -0700
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 at oracle.com>
Acked-by: Eric Engestrom <eric.engestrom at intel.com>
---
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 d704baf12b9..729b5b79868 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__
More information about the mesa-commit
mailing list