comparison src/if_perl.xs @ 4905:517fa1a34c7c v7.3.1198

updated for version 7.3.1198 Problem: Build error when using Perl 5.18.0 and dynamic loading. Solution: Change #ifdefs for Perl_croak_xs_usage. (Ike Devolder)
author Bram Moolenaar <bram@vim.org>
date Sat, 15 Jun 2013 16:47:35 +0200
parents 04736b4030ec
children b882d4b14e00
comparison
equal deleted inserted replaced
4904:a412fe715ffd 4905:517fa1a34c7c
65 #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \ 65 #if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \
66 (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1)) 66 (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1))
67 # define PERL5101_OR_LATER 67 # define PERL5101_OR_LATER
68 #endif 68 #endif
69 69
70 #if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
71 # define PERL5180_OR_LATER
72 #endif
73
70 #ifndef pTHX 74 #ifndef pTHX
71 # define pTHX void 75 # define pTHX void
72 # define pTHX_ 76 # define pTHX_
73 #endif 77 #endif
74 78
125 # define perl_run dll_perl_run 129 # define perl_run dll_perl_run
126 # define perl_destruct dll_perl_destruct 130 # define perl_destruct dll_perl_destruct
127 # define perl_free dll_perl_free 131 # define perl_free dll_perl_free
128 # define Perl_get_context dll_Perl_get_context 132 # define Perl_get_context dll_Perl_get_context
129 # define Perl_croak dll_Perl_croak 133 # define Perl_croak dll_Perl_croak
134 # ifndef PERL5180_OR_LATER
130 # ifdef PERL5101_OR_LATER 135 # ifdef PERL5101_OR_LATER
131 # define Perl_croak_xs_usage dll_Perl_croak_xs_usage 136 # define Perl_croak_xs_usage dll_Perl_croak_xs_usage
137 # endif
132 # endif 138 # endif
133 # ifndef PROTO 139 # ifndef PROTO
134 # define Perl_croak_nocontext dll_Perl_croak_nocontext 140 # define Perl_croak_nocontext dll_Perl_croak_nocontext
135 # define Perl_call_argv dll_Perl_call_argv 141 # define Perl_call_argv dll_Perl_call_argv
136 # define Perl_call_pv dll_Perl_call_pv 142 # define Perl_call_pv dll_Perl_call_pv
240 static void (*perl_free)(PerlInterpreter*); 246 static void (*perl_free)(PerlInterpreter*);
241 static int (*perl_run)(PerlInterpreter*); 247 static int (*perl_run)(PerlInterpreter*);
242 static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); 248 static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
243 static void* (*Perl_get_context)(void); 249 static void* (*Perl_get_context)(void);
244 static void (*Perl_croak)(pTHX_ const char*, ...); 250 static void (*Perl_croak)(pTHX_ const char*, ...);
251 #ifndef PERL5180_OR_LATER
245 #ifdef PERL5101_OR_LATER 252 #ifdef PERL5101_OR_LATER
246 static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); 253 static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params);
254 #endif
247 #endif 255 #endif
248 static void (*Perl_croak_nocontext)(const char*, ...); 256 static void (*Perl_croak_nocontext)(const char*, ...);
249 static I32 (*Perl_dowantarray)(pTHX); 257 static I32 (*Perl_dowantarray)(pTHX);
250 static void (*Perl_free_tmps)(pTHX); 258 static void (*Perl_free_tmps)(pTHX);
251 static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32); 259 static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
360 {"perl_free", (PERL_PROC*)&perl_free}, 368 {"perl_free", (PERL_PROC*)&perl_free},
361 {"perl_run", (PERL_PROC*)&perl_run}, 369 {"perl_run", (PERL_PROC*)&perl_run},
362 {"perl_parse", (PERL_PROC*)&perl_parse}, 370 {"perl_parse", (PERL_PROC*)&perl_parse},
363 {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, 371 {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
364 {"Perl_croak", (PERL_PROC*)&Perl_croak}, 372 {"Perl_croak", (PERL_PROC*)&Perl_croak},
373 #ifndef PERL5180_OR_LATER
365 #ifdef PERL5101_OR_LATER 374 #ifdef PERL5101_OR_LATER
366 {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, 375 {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage},
376 #endif
367 #endif 377 #endif
368 {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, 378 {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext},
369 {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray}, 379 {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray},
370 {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps}, 380 {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps},
371 {"Perl_gv_stashpv", (PERL_PROC*)&Perl_gv_stashpv}, 381 {"Perl_gv_stashpv", (PERL_PROC*)&Perl_gv_stashpv},