aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorvanhauser-thc <vh@thc.org>2024-02-29 09:10:22 +0100
committervanhauser-thc <vh@thc.org>2024-02-29 09:10:29 +0100
commit036a79268b48a0e3e061d5e3387711f69bed8d56 (patch)
tree0488b09ebbb8f676f88d29530b56e83b99f60a36 /include
parent603136efa032d62eec14720a7435ce0a6d143bb6 (diff)
downloadafl++-036a79268b48a0e3e061d5e3387711f69bed8d56.tar.gz
gcc cmplog fix
Diffstat (limited to 'include')
-rw-r--r--include/t1ha_bits.h15
-rw-r--r--include/xxhash.h30
2 files changed, 26 insertions, 19 deletions
diff --git a/include/t1ha_bits.h b/include/t1ha_bits.h
index e7a8d53c..0b9bbda5 100644
--- a/include/t1ha_bits.h
+++ b/include/t1ha_bits.h
@@ -207,7 +207,7 @@ static __maybe_unused __always_inline unsigned e2k_add64carry_first(
return (unsigned)__builtin_e2k_addcd_c(base, addend, 0);
}
-\
+
#define add64carry_first(base, addend, sum) \
e2k_add64carry_first(base, addend, sum)
@@ -218,7 +218,7 @@ static __maybe_unused __always_inline unsigned e2k_add64carry_next(
return (unsigned)__builtin_e2k_addcd_c(base, addend, carry);
}
-\
+
#define add64carry_next(carry, base, addend, sum) \
e2k_add64carry_next(carry, base, addend, sum)
@@ -230,7 +230,7 @@ static __maybe_unused __always_inline void e2k_add64carry_last(unsigned carry,
*sum = __builtin_e2k_addcd(base, addend, carry);
}
-\
+
#define add64carry_last(carry, base, addend, sum) \
e2k_add64carry_last(carry, base, addend, sum)
#endif /* __iset__ >= 5 */
@@ -311,7 +311,7 @@ static __forceinline char msvc32_add64carry_first(uint64_t base,
base_32h, addend_32h, sum32 + 1);
}
-\
+
#define add64carry_first(base, addend, sum) \
msvc32_add64carry_first(base, addend, sum)
@@ -328,7 +328,7 @@ static __forceinline char msvc32_add64carry_next(char carry, uint64_t base,
base_32h, addend_32h, sum32 + 1);
}
-\
+
#define add64carry_next(carry, base, addend, sum) \
msvc32_add64carry_next(carry, base, addend, sum)
@@ -345,7 +345,7 @@ static __forceinline void msvc32_add64carry_last(char carry, uint64_t base,
addend_32h, sum32 + 1);
}
-\
+
#define add64carry_last(carry, base, addend, sum) \
msvc32_add64carry_last(carry, base, addend, sum)
#endif /* _MSC_FULL_VER >= 190024231 */
@@ -454,7 +454,7 @@ typedef struct {
uint64_t unaligned_64;
} __attribute__((__packed__)) t1ha_unaligned_proxy;
-\
+
#define read_unaligned(ptr, bits) \
(((const t1ha_unaligned_proxy *)((const uint8_t *)(ptr)-offsetof( \
t1ha_unaligned_proxy, unaligned_##bits))) \
@@ -539,6 +539,7 @@ static __always_inline const uint64_t *__attribute__((
(void)(ptr); \
\
} while (0)
+
#endif
#endif /* prefetch */
diff --git a/include/xxhash.h b/include/xxhash.h
index 7697d0f2..991a8f1e 100644
--- a/include/xxhash.h
+++ b/include/xxhash.h
@@ -1734,7 +1734,7 @@ XXH128_hashFromCanonical(XXH_NOESCAPE const XXH128_canonical_t *src);
* These declarations should only be used with static linking.
* Never use them in association with dynamic linking!
*****************************************************************************
-*/
+ */
/*
* These definitions are only present to allow static allocation
@@ -2399,9 +2399,9 @@ XXH_PUBLIC_API XXH_errorcode XXH3_128bits_reset_withSecretandSeed(
#define XXH_NO_STREAM
#undef XXH_NO_STREAM /* don't actually */
#endif /* XXH_DOXYGEN */
-/*!
- * @}
- */
+ /*!
+ * @}
+ */
#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command \
line for example */
@@ -2614,6 +2614,7 @@ static void *XXH_memcpy(void *dest, const void *src, size_t size) {
_Static_assert((c), m); \
\
} while (0)
+
#elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */
#define XXH_STATIC_ASSERT_WITH_MESSAGE(c, m) \
do { \
@@ -2621,6 +2622,7 @@ static void *XXH_memcpy(void *dest, const void *src, size_t size) {
static_assert((c), m); \
\
} while (0)
+
#else
#define XXH_STATIC_ASSERT_WITH_MESSAGE(c, m) \
do { \
@@ -2632,6 +2634,7 @@ static void *XXH_memcpy(void *dest, const void *src, size_t size) {
}; \
\
} while (0)
+
#endif
#define XXH_STATIC_ASSERT(c) XXH_STATIC_ASSERT_WITH_MESSAGE((c), #c)
#endif
@@ -2850,7 +2853,7 @@ static int XXH_isLittleEndian(void) {
return one.c[0];
}
-\
+
#define XXH_CPU_LITTLE_ENDIAN XXH_isLittleEndian()
#endif
#endif
@@ -4679,6 +4682,7 @@ XXH_FORCE_INLINE xxh_u64x2 XXH_vec_mule(xxh_u32x4 a, xxh_u32x4 b) {
acc = svadd_u64_x(mask, acc, mul); \
\
} while (0)
+
#endif /* XXH_VECTOR == XXH_SVE */
/* prefetch
@@ -4737,12 +4741,14 @@ static const xxh_u8 XXH3_kSecret[XXH_SECRET_DEFAULT_SIZE] = {
};
-static const xxh_u64 PRIME_MX1 = 0x165667919E3779F9ULL; /*!<
- 0b0001011001010110011001111001000110011110001101110111100111111001
- */
-static const xxh_u64 PRIME_MX2 = 0x9FB21C651E98DF25ULL; /*!<
- 0b1001111110110010000111000110010100011110100110001101111100100101
- */
+static const xxh_u64 PRIME_MX1 =
+ 0x165667919E3779F9ULL; /*!<
+ 0b0001011001010110011001111001000110011110001101110111100111111001
+ */
+static const xxh_u64 PRIME_MX2 =
+ 0x9FB21C651E98DF25ULL; /*!<
+ 0b1001111110110010000111000110010100011110100110001101111100100101
+ */
#ifdef XXH_OLD_NAMES
#define kSecret XXH3_kSecret
@@ -7854,7 +7860,7 @@ XXH3_128bits_digest(XXH_NOESCAPE const XXH3_state_t *state) {
}
#endif /* !XXH_NO_STREAM */
- /* 128-bit utility functions */
+ /* 128-bit utility functions */
#include <string.h> /* memcmp, memcpy */