diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-02-01 13:07:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-02-01 13:07:43 +0000 |
| commit | 41dc9d8afff3b11110e190a6869959f415b8dc7b (patch) | |
| tree | 4e0edb9879a2c3818cf8e8d17d28a6fa483a94a1 /contrib | |
| parent | f0615c9cb4b72c25d32e818e86bc030810fa00e7 (diff) | |
| download | rspamd-41dc9d8afff3b11110e190a6869959f415b8dc7b.tar.gz rspamd-41dc9d8afff3b11110e190a6869959f415b8dc7b.zip | |
[Minor] Improve portability
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/mumhash/mum.h | 4 | ||||
| -rw-r--r-- | contrib/t1ha/t1ha.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/contrib/mumhash/mum.h b/contrib/mumhash/mum.h index ae6eec16c..9fab8e7bc 100644 --- a/contrib/mumhash/mum.h +++ b/contrib/mumhash/mum.h @@ -62,7 +62,7 @@ typedef unsigned __int64 uint64_t; /* In GCC uint128_t is defined if HOST_BITS_PER_WIDE_INT >= 64. HOST_WIDE_INT is long if HOST_BITS_PER_LONG > HOST_BITS_PER_INT, otherwise int. */ -#if defined(__GNUC__) && UINT_MAX != ULONG_MAX +#ifdef __SIZEOF_INT128__ #define _MUM_USE_INT128 1 #else #define _MUM_USE_INT128 0 @@ -73,7 +73,7 @@ typedef unsigned __int64 uint64_t; #define _MUM_FRESH_GCC #endif -#if defined(__GNUC__) && !defined(__llvm__) +#if !defined(__llvm__) && defined(_MUM_FRESH_GCC) #define _MUM_ATTRIBUTE_UNUSED __attribute__((unused)) #define _MUM_OPTIMIZE(opts) __attribute__((__optimize__ (opts))) #define _MUM_TARGET(opts) __attribute__((__target__ (opts))) diff --git a/contrib/t1ha/t1ha.h b/contrib/t1ha/t1ha.h index 2f6e48e3f..1ad763c3a 100644 --- a/contrib/t1ha/t1ha.h +++ b/contrib/t1ha/t1ha.h @@ -113,7 +113,15 @@ #endif #define likely(cond) __builtin_expect(!!(cond), 1) #define unlikely(cond) __builtin_expect(!!(cond), 0) +# if __GNUC_PREREQ(4, 6) || defined(__clang__) #define unreachable() __builtin_unreachable() +# else +#define unreachable() \ + do { \ + for (;;) \ + ; \ + } while (0) +# endif #define bswap64(v) __builtin_bswap64(v) #define bswap32(v) __builtin_bswap32(v) #if __GNUC_PREREQ(4, 8) || __has_builtin(__builtin_bswap16) |