diff options
| author | Khaled Yakdan <yakdan@code-intelligence.de> | 2019-08-01 14:22:48 +0200 |
|---|---|---|
| committer | Khaled Yakdan <yakdan@code-intelligence.de> | 2019-08-01 14:22:48 +0200 |
| commit | ebf2c8caa590468e1eafbc257e44dc30af82e5f8 (patch) | |
| tree | 2b277b9bde32b82c2cedf684869c96424baa005f /types.h | |
| parent | a949b40d11956f34c51f4546412a73e0400d1ffc (diff) | |
| parent | 7ca22cd552ff21ac0ef7cc1ab5e6e71912752a58 (diff) | |
| download | afl++-ebf2c8caa590468e1eafbc257e44dc30af82e5f8.tar.gz | |
Merge remote-tracking branch 'github/master' into custom_mutator
# Conflicts: # Makefile # afl-fuzz.c
Diffstat (limited to 'types.h')
| -rw-r--r-- | types.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/types.h b/types.h index 784d3a7a..7606d4ed 100644 --- a/types.h +++ b/types.h @@ -78,9 +78,14 @@ typedef int64_t s64; #define STRINGIFY(x) STRINGIFY_INTERNAL(x) #define MEM_BARRIER() \ - asm volatile("" ::: "memory") + __asm__ volatile("" ::: "memory") -#define likely(_x) __builtin_expect(!!(_x), 1) -#define unlikely(_x) __builtin_expect(!!(_x), 0) +#if __GNUC__ < 6 + #define likely(_x) (_x) + #define unlikely(_x) (_x) +#else + #define likely(_x) __builtin_expect(!!(_x), 1) + #define unlikely(_x) __builtin_expect(!!(_x), 0) +#endif #endif /* ! _HAVE_TYPES_H */ |