0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 8.2.4032: ATTRIBUTE_NORETURN is not needed

Problem:    ATTRIBUTE_NORETURN is not needed.
Solution:   Use NORETURN(). (Ozaki Kiichi, closes #9487)
This commit is contained in:
ichizok
2022-01-07 20:01:07 +00:00
committed by Bram Moolenaar
parent d1f34e64f0
commit e12406526a
3 changed files with 10 additions and 6 deletions

View File

@@ -502,7 +502,11 @@ static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
# endif # endif
# endif # endif
# if RUBY_VERSION >= 31 # 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 # endif
# if RUBY_VERSION >= 18 # if RUBY_VERSION >= 18
static char * (*dll_rb_string_value_ptr) (volatile VALUE*); static char * (*dll_rb_string_value_ptr) (volatile VALUE*);

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4032,
/**/ /**/
4031, 4031,
/**/ /**/

View File

@@ -2178,15 +2178,13 @@ typedef struct stat stat_T;
#endif #endif
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
# define likely(x) __builtin_expect((x), 1) # define likely(x) __builtin_expect((x), 1)
# define unlikely(x) __builtin_expect((x), 0) # define unlikely(x) __builtin_expect((x), 0)
# define ATTRIBUTE_COLD __attribute__((cold)) # define ATTRIBUTE_COLD __attribute__((cold))
# define ATTRIBUTE_NORETURN __attribute__((noreturn))
#else #else
# define unlikely(x) (x) # define unlikely(x) (x)
# define likely(x) (x) # define likely(x) (x)
# define ATTRIBUTE_COLD # define ATTRIBUTE_COLD
# define ATTRIBUTE_NORETURN
#endif #endif
typedef enum { typedef enum {