commit e12406526a24768e6121450112eb2f9f92445ac5
author ichizok <gclient.gaap@gmail.com> Fri Jan 07 20:01:07 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Jan 07 20:01:07 2022 +0000
tree f1b210d11d09b73638174dfa212eab2a9287e747
parent d1f34e64f0e1a9ddaed76623bc40e669f2d09260

patch 8.2.4032: ATTRIBUTE_NORETURN is not needed

Problem:    ATTRIBUTE_NORETURN is not needed.
Solution:   Use NORETURN(). (Ozaki Kiichi, closes #9487)

src/if_ruby.c

diff --git a/src/if_ruby.c b/src/if_ruby.c
index fcbbf33..c58c3c5 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -502,7 +502,11 @@
 #  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*);

src/version.c

diff --git a/src/version.c b/src/version.c
index cc9d81e..78f1f2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4032,
+/**/
     4031,
 /**/
     4030,

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index 87fdbb1..5d8f32e 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2178,15 +2178,13 @@
 #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 {