diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-02 18:56:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 18:56:27 +0300 |
| commit | 451b3fac158ca3586a149fa64fe10f86ec140a43 (patch) | |
| tree | 01738484d7222e3b637e17142bea18152f504166 /src/common/cbasetypes.h | |
| parent | cb2769b8b3b18c90b017f600654ce494ff260f9f (diff) | |
| parent | b4f015cb31ec2cb60c45b22bd17e0e05fcd6be41 (diff) | |
| download | hercules-451b3fac158ca3586a149fa64fe10f86ec140a43.tar.gz hercules-451b3fac158ca3586a149fa64fe10f86ec140a43.tar.bz2 hercules-451b3fac158ca3586a149fa64fe10f86ec140a43.tar.xz hercules-451b3fac158ca3586a149fa64fe10f86ec140a43.zip | |
Merge pull request #1453 from HerculesWS/gitlab
Added GitLab CI configuration
Diffstat (limited to 'src/common/cbasetypes.h')
| -rw-r--r-- | src/common/cbasetypes.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 33d617b13..98c3552c4 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -291,12 +291,12 @@ typedef uintptr_t uintptr; #define GCC_VERSION 0 #endif -// Pragma macro only enabled on gcc >= 4.5 or clang - borrowed from Mana Plus -#if defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) -#define PRAGMA_GCC45(str) _Pragma(#str) -#else // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) -#define PRAGMA_GCC45(str) -#endif // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40500) +// Pragma macro only enabled on gcc >= 4.6 or clang - borrowed from Mana Plus +#if defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40600) +#define PRAGMA_GCC46(str) _Pragma(#str) +#else // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40600) +#define PRAGMA_GCC46(str) +#endif // ! defined(__GNUC__) && (defined(__clang__) || GCC_VERSION >= 40600) // fallthrough attribute only enabled on gcc >= 7.0 #if defined(__GNUC__) && (GCC_VERSION >= 70000) |