Remove detection config for the restrict keyword. This can be done ea…

…sily in the preprocessor instead.
sandialabs · Sep 16, 2024 · aaa085e · aaa085e
1 parent a854a4f
commit aaa085e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 108 deletions.
diff --git a/config/ax_c_restrict.m4 b/config/ax_c_restrict.m4
diff --git a/configure.ac b/configure.ac
@@ -592,7 +592,6 @@ AS_IF([test "x$qthread_cv_cxx_compiler_type" = "xIntel"],
 
 AC_C_CONST
 AC_C_INLINE
-AX_C_RESTRICT
 AC_C_VOLATILE
 AS_IF([test "x$enable_third_party_benchmarks" = xyes],
       [AX_OPENMP([have_openmp=yes], [have_openmp=no])

diff --git a/include/qthread/common.h.in b/include/qthread/common.h.in
@@ -71,11 +71,12 @@
 /* Last resort, if no function name macros can be found */
 #undef __FUNCTION__
 
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#ifndef restrict
-#undef restrict
+#ifdef __cplusplus
+#ifdef __GNUC__
+#define restrict __restrict
+#else
+#define restrict
+#endif
 #endif
 
 /* If __builtin_trap can be used */