aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 7.4.1693

Browse Source 
Problem:    Building the Perl interface gives compiler warnings.
Solution:   Remove a pragma. Add noreturn attributes. (Damien)
This commit is contained in:
Bram Moolenaar
2016-04-02 14:18:01 +02:00
parent 9bd547aca4
commit 864733ad92
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/if_perl.xs
View File

@@ -52,7 +52,6 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-variable" # pragma GCC diagnostic ignored "-Wunused-variable"
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif #endif
#include <EXTERN.h> #include <EXTERN.h>
@@ -307,16 +306,18 @@ static void (*perl_free)(PerlInterpreter*);
static int (*perl_run)(PerlInterpreter*); static int (*perl_run)(PerlInterpreter*);
static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
static void* (*Perl_get_context)(void); static void* (*Perl_get_context)(void);
static void (*Perl_croak)(pTHX_ const char*, ...); static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__noreturn__;
#ifdef PERL5101_OR_LATER #ifdef PERL5101_OR_LATER
/* Perl-5.18 has a different Perl_croak_xs_usage signature. */ /* Perl-5.18 has a different Perl_croak_xs_usage signature. */
# if (PERL_REVISION == 5) && (PERL_VERSION >= 18) # if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
static void (*Perl_croak_xs_usage)(const CV *const, const char *const params); static void (*Perl_croak_xs_usage)(const CV *const, const char *const params)
__attribute__noreturn__;
# else # else
static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params)
__attribute__noreturn__;
# endif # endif
#endif #endif
static void (*Perl_croak_nocontext)(const char*, ...); static void (*Perl_croak_nocontext)(const char*, ...) __attribute__noreturn__;
static I32 (*Perl_dowantarray)(pTHX); static I32 (*Perl_dowantarray)(pTHX);
static void (*Perl_free_tmps)(pTHX); static void (*Perl_free_tmps)(pTHX);
static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32); static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
@@ -591,7 +592,9 @@ static struct {
* "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined. * "perl\lib\CORE\inline.h", after Perl_sv_free2 is defined.
* The linker won't complain about undefined __impl_Perl_sv_free2. */ * The linker won't complain about undefined __impl_Perl_sv_free2. */
#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) #if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
# define PL_memory_wrap "panic: memory wrap" /* Dummy */
# include <inline.h> # include <inline.h>
# undef PL_memory_wrap
#endif #endif
/* /*
@@ -1516,7 +1519,8 @@ SetHeight(win, height)
curwin = savewin; curwin = savewin;
void void
Cursor(VIWIN win, ...) Cursor(win, ...)
VIWIN win
PPCODE: PPCODE:
if (items == 1) if (items == 1)

2
src/version.c
View File

@@ -748,6 +748,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 */
/**/
1693,
/**/ /**/
1692, 1692,
/**/ /**/