diff options
| author | ichizok <gclient.gaap@gmail.com> | 2022-01-07 20:01:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-07 20:01:07 +0000 |
| commit | e12406526a24768e6121450112eb2f9f92445ac5 (patch) | |
| tree | f1b210d11d09b73638174dfa212eab2a9287e747 | |
| parent | d1f34e64f0e1a9ddaed76623bc40e669f2d09260 (diff) | |
| download | vim-git-e12406526a24768e6121450112eb2f9f92445ac5.tar.gz | |
patch 8.2.4032: ATTRIBUTE_NORETURN is not neededv8.2.4032
Problem: ATTRIBUTE_NORETURN is not needed.
Solution: Use NORETURN(). (Ozaki Kiichi, closes #9487)
| -rw-r--r-- | src/if_ruby.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index fcbbf336e..c58c3c5f1 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -502,7 +502,11 @@ static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...); # endif # endif # if RUBY_VERSION >= 31 -static void (*dll_rb_unexpected_type) (VALUE, int) ATTRIBUTE_NORETURN; +# ifdef _MSC_VER +static void (*dll_rb_unexpected_type) (VALUE, int); +# else +NORETURN(static void (*dll_rb_unexpected_type) (VALUE, int)); +# endif # endif # if RUBY_VERSION >= 18 static char * (*dll_rb_string_value_ptr) (volatile VALUE*); diff --git a/src/version.c b/src/version.c index cc9d81ea2..78f1f2dec 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4032, +/**/ 4031, /**/ 4030, @@ -2178,15 +2178,13 @@ typedef struct stat stat_T; #endif #if defined(__GNUC__) || defined(__clang__) -# define likely(x) __builtin_expect((x), 1) -# define unlikely(x) __builtin_expect((x), 0) -# define ATTRIBUTE_COLD __attribute__((cold)) -# define ATTRIBUTE_NORETURN __attribute__((noreturn)) +# define likely(x) __builtin_expect((x), 1) +# define unlikely(x) __builtin_expect((x), 0) +# define ATTRIBUTE_COLD __attribute__((cold)) #else # define unlikely(x) (x) # define likely(x) (x) # define ATTRIBUTE_COLD -# define ATTRIBUTE_NORETURN #endif typedef enum { |