diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-29 18:15:20 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-29 18:15:20 +0000 |
| commit | a3835fad0c490fe5aeecc9c0d75e085538a24330 (patch) | |
| tree | cef93aee70554d729b6ef2d185dc12f95f7bd354 /include | |
| parent | 96b9c617870edf6cdbac1e7ed1cd56a33bf39656 (diff) | |
| download | mariadb-git-a3835fad0c490fe5aeecc9c0d75e085538a24330.tar.gz | |
Correct definition of ATTRIBUTE_NORETURN on Windows.
Only microsoft compiler, which can be correctly
tested with #ifdef _MSC_VER) has __declspec(noreturn)
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_compiler.h b/include/my_compiler.h index 97e6f9ae106..997c474b129 100644 --- a/include/my_compiler.h +++ b/include/my_compiler.h @@ -161,7 +161,7 @@ marked as unlikely by the branch prediction mechanism. optimize a rarely invoked function for size instead for speed. */ # define ATTRIBUTE_COLD __attribute__((cold)) # endif -#elif defined _WIN32 +#elif defined _MSC_VER # define ATTRIBUTE_NORETURN __declspec(noreturn) #else # define ATTRIBUTE_NORETURN /* empty */ |