aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.2047: perl: warning about inconsistent dll linkage

Browse Source 
Problem:  perl: warning about inconsistent dll linkage
Solution: suppress warning

Suppress warning C4273 (inconsistent DLL linkage).

Also adjust inconsistent use of const.

closes: #13369

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ken Takata <kentkt@csc.jp>
This commit is contained in:
Ken Takata 2023-10-18 11:59:44 +02:00 committed by Christian Brabandt
parent 436f39390f
commit 2b126a6892
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/if_perl.xs
View File

@ -46,6 +46,11 @@
# define NO_THREAD_SAFE_LOCALE # define NO_THREAD_SAFE_LOCALE
#endif #endif
#if defined(MSWIN) && defined(DYNAMIC_PERL)
// Work around for warning C4273 (inconsistent DLL linkage).
# define PERL_EXT_RE_BUILD
#endif
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-variable" # pragma GCC diagnostic ignored "-Wunused-variable"
@ -1483,7 +1488,7 @@ vim_IOLayer_init(void)
# if (PERL_REVISION == 5) && (PERL_VERSION >= 18) # if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
# undef Perl_sv_free2 # undef Perl_sv_free2
void Perl_sv_free2(pTHX_ SV* sv, const U32 refcnt) void Perl_sv_free2(pTHX_ SV *const sv, const U32 refcnt)
{ {
(*dll_Perl_sv_free2)(aTHX_ sv, refcnt); (*dll_Perl_sv_free2)(aTHX_ sv, refcnt);
} }
@ -1519,7 +1524,7 @@ NV Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags)
# ifdef PERL589_OR_LATER # ifdef PERL589_OR_LATER
# undef Perl_sv_2iv_flags # undef Perl_sv_2iv_flags
IV Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags) IV Perl_sv_2iv_flags(pTHX_ SV *const sv, const I32 flags)
{ {
return (*dll_Perl_sv_2iv_flags)(aTHX_ sv, flags); return (*dll_Perl_sv_2iv_flags)(aTHX_ sv, flags);
} }

2
src/version.c
View File

@ -704,6 +704,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 */
/**/
2047,
/**/ /**/
2046, 2046,
/**/ /**/