To: vim_dev@googlegroups.com Subject: Patch 7.4.1693 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1693 Problem: Building the Perl interface gives compiler warnings. Solution: Remove a pragma. Add noreturn attributes. (Damien) Files: src/if_perl.xs *** ../vim-7.4.1692/src/if_perl.xs 2016-02-23 16:06:18.139325951 +0100 --- src/if_perl.xs 2016-04-02 13:32:57.368882522 +0200 *************** *** 52,58 **** #ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-variable" - # pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif #include --- 52,57 ---- *************** *** 307,322 **** static int (*perl_run)(PerlInterpreter*); static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); static void* (*Perl_get_context)(void); ! static void (*Perl_croak)(pTHX_ const char*, ...); #ifdef PERL5101_OR_LATER /* Perl-5.18 has a different Perl_croak_xs_usage signature. */ # if (PERL_REVISION == 5) && (PERL_VERSION >= 18) ! static void (*Perl_croak_xs_usage)(const CV *const, const char *const params); # else ! static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); # endif #endif ! static void (*Perl_croak_nocontext)(const char*, ...); static I32 (*Perl_dowantarray)(pTHX); static void (*Perl_free_tmps)(pTHX); static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32); --- 306,323 ---- static int (*perl_run)(PerlInterpreter*); static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); static void* (*Perl_get_context)(void); ! static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__noreturn__; #ifdef PERL5101_OR_LATER /* Perl-5.18 has a different Perl_croak_xs_usage signature. */ # if (PERL_REVISION == 5) && (PERL_VERSION >= 18) ! static void (*Perl_croak_xs_usage)(const CV *const, const char *const params) ! __attribute__noreturn__; # else ! static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params) ! __attribute__noreturn__; # endif #endif ! static void (*Perl_croak_nocontext)(const char*, ...) __attribute__noreturn__; static I32 (*Perl_dowantarray)(pTHX); static void (*Perl_free_tmps)(pTHX); static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32); *************** *** 591,597 **** --- 592,600 ---- * "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined. * The linker won't complain about undefined __impl_Perl_sv_free2. */ #if (PERL_REVISION == 5) && (PERL_VERSION >= 18) + # define PL_memory_wrap "panic: memory wrap" /* Dummy */ # include + # undef PL_memory_wrap #endif /* *************** *** 1516,1522 **** curwin = savewin; void ! Cursor(VIWIN win, ...) PPCODE: if (items == 1) --- 1519,1526 ---- curwin = savewin; void ! Cursor(win, ...) ! VIWIN win PPCODE: if (items == 1) *** ../vim-7.4.1692/src/version.c 2016-04-01 21:00:44.794732242 +0200 --- src/version.c 2016-04-02 13:35:08.279556157 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1693, /**/ -- hundred-and-one symptoms of being an internet addict: 183. You move your coffeemaker next to your computer. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///