diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
| commit | 2c1067166d7e8a9541578220b408f1e553e23916 (patch) | |
| tree | 2ba0932f92d88e01d51393de63dda842f6daf320 /include/my_compiler.h | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 61b2618d3aae78950f1b8dbe8d4482573c77875d (diff) | |
| download | mariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'include/my_compiler.h')
| -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 fbb4b959e8d..7db070d57e1 100644 --- a/include/my_compiler.h +++ b/include/my_compiler.h @@ -159,7 +159,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 */ |