summaryrefslogtreecommitdiffstats
path: root/include/import/xxhash.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:10 +0000
commitd2a536e458f4cd7ffeadfe302c23bbfe263b0053 (patch)
treefec732451d7ffbd0e7b8c4461dfcfe36faa13322 /include/import/xxhash.h
parentAdding debian version 2.9.7-1. (diff)
downloadhaproxy-d2a536e458f4cd7ffeadfe302c23bbfe263b0053.tar.xz
haproxy-d2a536e458f4cd7ffeadfe302c23bbfe263b0053.zip
Merging upstream version 3.0.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--include/import/xxhash.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/import/xxhash.h b/include/import/xxhash.h
index a18e8c7..7c3c3fc 100644
--- a/include/import/xxhash.h
+++ b/include/import/xxhash.h
@@ -3387,7 +3387,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(XXH_NOESCAPE const XXH64_can
/* === Compiler specifics === */
-#if ((defined(sun) || defined(__sun)) && __cplusplus) /* Solaris includes __STDC_VERSION__ with C++. Tested with GCC 5.5 */
+#if ((defined(sun) || defined(__sun)) && defined(__cplusplus) && __cplusplus) /* Solaris includes __STDC_VERSION__ with C++. Tested with GCC 5.5 */
# define XXH_RESTRICT /* disable */
#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* >= C99 */
# define XXH_RESTRICT restrict