Prefer -std=c89 over -ansi.

[perl5.git] / embed.h

diff --git a/embed.h b/embed.h
index 53fd3c9..61a81b4 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -117,6 +117,10 @@
 #define debstackptrs()         Perl_debstackptrs(aTHX)
 #define delimcpy               Perl_delimcpy
 #define despatch_signals()     Perl_despatch_signals(aTHX)
+#ifndef PERL_IMPLICIT_CONTEXT
+#define die                    Perl_die
+#endif
+#define die_sv(a)              Perl_die_sv(aTHX_ a)
 #define do_binmode(a,b,c)      Perl_do_binmode(aTHX_ a,b,c)
 #define do_close(a,b)          Perl_do_close(aTHX_ a,b)
 #define do_gv_dump(a,b,c,d)    Perl_do_gv_dump(aTHX_ a,b,c,d)
@@ -750,16 +754,6 @@
 #if !(defined(NO_MATHOMS))
 #define sv_nounlocking(a)      Perl_sv_nounlocking(aTHX_ a)
 #endif
-#if !(defined(_MSC_VER))
-#ifndef PERL_IMPLICIT_CONTEXT
-#define die                    Perl_die
-#endif
-#define die_sv(a)              Perl_die_sv(aTHX_ a)
-#define screaminstr(a,b,c,d,e,f)       Perl_screaminstr(aTHX_ a,b,c,d,e,f)
-#  if defined(PERL_IMPLICIT_CONTEXT)
-#define die_nocontext          Perl_die_nocontext
-#  endif
-#endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
 #define my_bzero               Perl_my_bzero
 #endif
@@ -805,6 +799,7 @@
 #if defined(PERL_IMPLICIT_CONTEXT)
 #define croak_nocontext                Perl_croak_nocontext
 #define deb_nocontext          Perl_deb_nocontext
+#define die_nocontext          Perl_die_nocontext
 #define form_nocontext         Perl_form_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
 #define load_module_nocontext  Perl_load_module_nocontext
@@ -817,9 +812,6 @@
 #define sv_setpvf_nocontext    Perl_sv_setpvf_nocontext
 #define warn_nocontext         Perl_warn_nocontext
 #define warner_nocontext       Perl_warner_nocontext
-#  if defined(_MSC_VER)
-#define die_nocontext          Perl_die_nocontext
-#  endif
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_PERL_C) || defined(PERL_IN_UTF8_C)
 #define _new_invlist_C_array(a)        Perl__new_invlist_C_array(aTHX_ a)
@@ -896,14 +888,8 @@
 #define do_spawn(a)            Perl_do_spawn(aTHX_ a)
 #define do_spawn_nowait(a)     Perl_do_spawn_nowait(aTHX_ a)
 #endif
-#if defined(_MSC_VER)
-#ifndef PERL_IMPLICIT_CONTEXT
-#define die                    Perl_die
-#endif
-#define die_sv(a)              Perl_die_sv(aTHX_ a)
-#define screaminstr(a,b,c,d,e,f)       Perl_screaminstr(aTHX_ a,b,c,d,e,f)
-#endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
+#define _get_encoding()                Perl__get_encoding(aTHX)
 #define av_reify(a)            Perl_av_reify(aTHX_ a)
 #define current_re_engine()    Perl_current_re_engine(aTHX)
 #define cv_ckproto_len_flags(a,b,c,d,e)        Perl_cv_ckproto_len_flags(aTHX_ a,b,c,d,e)
@@ -1261,7 +1247,6 @@
 #define noperl_die             Perl_noperl_die
 #define oopsAV(a)              Perl_oopsAV(aTHX_ a)
 #define oopsHV(a)              Perl_oopsHV(aTHX_ a)
-#define op_const_sv(a,b,c)     Perl_op_const_sv(aTHX_ a,b,c)
 #define op_unscope(a)          Perl_op_unscope(aTHX_ a)
 #define package(a)             Perl_package(aTHX_ a)
 #define package_version(a)     Perl_package_version(aTHX_ a)
@@ -1386,7 +1371,7 @@
 #  endif
 #  if defined(DEBUGGING)
 #define get_debug_opts(a,b)    Perl_get_debug_opts(aTHX_ a,b)
-#define set_padlist(a,b)       Perl_set_padlist(aTHX_ a,b)
+#define set_padlist            Perl_set_padlist
 #    if defined(PERL_IN_PAD_C)
 #define cv_dump(a,b)           S_cv_dump(aTHX_ a,b)
 #    endif
@@ -1743,7 +1728,7 @@
 #define isa_lookup(a,b,c,d)    S_isa_lookup(aTHX_ a,b,c,d)
 #  endif
 #  if defined(PERL_IN_UTF8_C)
-#define check_locale_boundary_crossing(a,b,c,d)        S_check_locale_boundary_crossing(aTHX_ a,b,c,d)
+#define check_locale_boundary_crossing(a,b,c,d,e)      S_check_locale_boundary_crossing(aTHX_ a,b,c,d,e)
 #define is_utf8_common(a,b,c,d)        S_is_utf8_common(aTHX_ a,b,c,d)
 #define swash_scan_list_line(a,b,c,d,e,f,g)    S_swash_scan_list_line(aTHX_ a,b,c,d,e,f,g)
 #define swatch_get(a,b,c)      S_swatch_get(aTHX_ a,b,c)