To: vim_dev@googlegroups.com Subject: Patch 8.2.4032 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4032 Problem: ATTRIBUTE_NORETURN is not needed. Solution: Use NORETURN(). (Ozaki Kiichi, closes #9487) Files: src/if_ruby.c, src/vim.h *** ../vim-8.2.4031/src/if_ruby.c 2022-01-01 21:59:11.034521924 +0000 --- src/if_ruby.c 2022-01-07 19:53:52.130157684 +0000 *************** *** 502,508 **** # endif # endif # if RUBY_VERSION >= 31 ! static void (*dll_rb_unexpected_type) (VALUE, int) ATTRIBUTE_NORETURN; # endif # if RUBY_VERSION >= 18 static char * (*dll_rb_string_value_ptr) (volatile VALUE*); --- 502,512 ---- # endif # endif # if RUBY_VERSION >= 31 ! # 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*); *** ../vim-8.2.4031/src/vim.h 2022-01-01 14:59:39.543684481 +0000 --- src/vim.h 2022-01-07 19:53:52.130157684 +0000 *************** *** 2178,2192 **** #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)) #else # define unlikely(x) (x) # define likely(x) (x) # define ATTRIBUTE_COLD - # define ATTRIBUTE_NORETURN #endif typedef enum { --- 2178,2190 ---- #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)) #else # define unlikely(x) (x) # define likely(x) (x) # define ATTRIBUTE_COLD #endif typedef enum { *** ../vim-8.2.4031/src/version.c 2022-01-07 19:24:16.194993990 +0000 --- src/version.c 2022-01-07 19:55:28.574005721 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4032, /**/ -- Vi is clearly superior to emacs, since "vi" has only two characters (and two keystrokes), while "emacs" has five. (Randy C. Ford) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///