[perl #25160] ':flock' not recognized unless it's first

[p5sagit/p5-mst-13.2.git] / embed.h

diff --git a/embed.h b/embed.h
index 2d195b6..dd5a05d 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -340,7 +340,6 @@
 #define hv_iterval             Perl_hv_iterval
 #define hv_ksplit              Perl_hv_ksplit
 #define hv_magic               Perl_hv_magic
-#define hv_scalar              Perl_hv_scalar
 #define hv_store               Perl_hv_store
 #define hv_store_ent           Perl_hv_store_ent
 #define hv_store_flags         Perl_hv_store_flags
@@ -537,9 +536,6 @@
 #define magic_regdatum_set     Perl_magic_regdatum_set
 #endif
 #ifdef PERL_CORE
-#define magic_scalarpack       Perl_magic_scalarpack
-#endif
-#ifdef PERL_CORE
 #define magic_set              Perl_magic_set
 #endif
 #ifdef PERL_CORE
@@ -972,13 +968,13 @@
 #define sv_2bool               Perl_sv_2bool
 #define sv_2cv                 Perl_sv_2cv
 #define sv_2io                 Perl_sv_2io
-#define sv_2iv                 Perl_sv_2iv
+#define sv_2iv_flags           Perl_sv_2iv_flags
 #define sv_2mortal             Perl_sv_2mortal
 #define sv_2nv                 Perl_sv_2nv
 #define sv_2pvutf8             Perl_sv_2pvutf8
 #define sv_2pvbyte             Perl_sv_2pvbyte
 #define sv_pvn_nomg            Perl_sv_pvn_nomg
-#define sv_2uv                 Perl_sv_2uv
+#define sv_2uv_flags           Perl_sv_2uv_flags
 #define sv_iv                  Perl_sv_iv
 #define sv_uv                  Perl_sv_uv
 #define sv_nv                  Perl_sv_nv
@@ -1528,6 +1524,9 @@
 #define doparseform            S_doparseform
 #endif
 #ifdef PERL_CORE
+#define num_overflow           S_num_overflow
+#endif
+#ifdef PERL_CORE
 #define dopoptoeval            S_dopoptoeval
 #endif
 #ifdef PERL_CORE
@@ -2054,7 +2053,7 @@
 #define my_atof2               Perl_my_atof2
 #define my_socketpair          Perl_my_socketpair
 #ifdef PERL_COPY_ON_WRITE
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define sv_setsv_cow           Perl_sv_setsv_cow
 #endif
 #endif
@@ -2156,6 +2155,10 @@
 #endif
 #endif
 #define hv_clear_placeholders  Perl_hv_clear_placeholders
+#define hv_scalar              Perl_hv_scalar
+#ifdef PERL_CORE
+#define magic_scalarpack       Perl_magic_scalarpack
+#endif
 #define ck_anoncode            Perl_ck_anoncode
 #define ck_bitop               Perl_ck_bitop
 #define ck_concat              Perl_ck_concat
@@ -2195,6 +2198,7 @@
 #define ck_substr              Perl_ck_substr
 #define ck_svconst             Perl_ck_svconst
 #define ck_trunc               Perl_ck_trunc
+#define ck_unpack              Perl_ck_unpack
 #define pp_aassign             Perl_pp_aassign
 #define pp_abs                 Perl_pp_abs
 #define pp_accept              Perl_pp_accept
@@ -2841,7 +2845,6 @@
 #define hv_iterval(a,b)                Perl_hv_iterval(aTHX_ a,b)
 #define hv_ksplit(a,b)         Perl_hv_ksplit(aTHX_ a,b)
 #define hv_magic(a,b,c)                Perl_hv_magic(aTHX_ a,b,c)
-#define hv_scalar(a)           Perl_hv_scalar(aTHX_ a)
 #define hv_store(a,b,c,d,e)    Perl_hv_store(aTHX_ a,b,c,d,e)
 #define hv_store_ent(a,b,c,d)  Perl_hv_store_ent(aTHX_ a,b,c,d)
 #define hv_store_flags(a,b,c,d,e,f)    Perl_hv_store_flags(aTHX_ a,b,c,d,e,f)
@@ -3037,9 +3040,6 @@
 #define magic_regdatum_set(a,b)        Perl_magic_regdatum_set(aTHX_ a,b)
 #endif
 #ifdef PERL_CORE
-#define magic_scalarpack(a,b)  Perl_magic_scalarpack(aTHX_ a,b)
-#endif
-#ifdef PERL_CORE
 #define magic_set(a,b)         Perl_magic_set(aTHX_ a,b)
 #endif
 #ifdef PERL_CORE
@@ -3471,13 +3471,13 @@
 #define sv_2bool(a)            Perl_sv_2bool(aTHX_ a)
 #define sv_2cv(a,b,c,d)                Perl_sv_2cv(aTHX_ a,b,c,d)
 #define sv_2io(a)              Perl_sv_2io(aTHX_ a)
-#define sv_2iv(a)              Perl_sv_2iv(aTHX_ a)
+#define sv_2iv_flags(a,b)      Perl_sv_2iv_flags(aTHX_ a,b)
 #define sv_2mortal(a)          Perl_sv_2mortal(aTHX_ a)
 #define sv_2nv(a)              Perl_sv_2nv(aTHX_ a)
 #define sv_2pvutf8(a,b)                Perl_sv_2pvutf8(aTHX_ a,b)
 #define sv_2pvbyte(a,b)                Perl_sv_2pvbyte(aTHX_ a,b)
 #define sv_pvn_nomg(a,b)       Perl_sv_pvn_nomg(aTHX_ a,b)
-#define sv_2uv(a)              Perl_sv_2uv(aTHX_ a)
+#define sv_2uv_flags(a,b)      Perl_sv_2uv_flags(aTHX_ a,b)
 #define sv_iv(a)               Perl_sv_iv(aTHX_ a)
 #define sv_uv(a)               Perl_sv_uv(aTHX_ a)
 #define sv_nv(a)               Perl_sv_nv(aTHX_ a)
@@ -4021,6 +4021,9 @@
 #define doparseform(a)         S_doparseform(aTHX_ a)
 #endif
 #ifdef PERL_CORE
+#define num_overflow           S_num_overflow
+#endif
+#ifdef PERL_CORE
 #define dopoptoeval(a)         S_dopoptoeval(aTHX_ a)
 #endif
 #ifdef PERL_CORE
@@ -4546,7 +4549,7 @@
 #define my_atof2(a,b)          Perl_my_atof2(aTHX_ a,b)
 #define my_socketpair          Perl_my_socketpair
 #ifdef PERL_COPY_ON_WRITE
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
 #define sv_setsv_cow(a,b)      Perl_sv_setsv_cow(aTHX_ a,b)
 #endif
 #endif
@@ -4648,6 +4651,10 @@
 #endif
 #endif
 #define hv_clear_placeholders(a)       Perl_hv_clear_placeholders(aTHX_ a)
+#define hv_scalar(a)           Perl_hv_scalar(aTHX_ a)
+#ifdef PERL_CORE
+#define magic_scalarpack(a,b)  Perl_magic_scalarpack(aTHX_ a,b)
+#endif
 #define ck_anoncode(a)         Perl_ck_anoncode(aTHX_ a)
 #define ck_bitop(a)            Perl_ck_bitop(aTHX_ a)
 #define ck_concat(a)           Perl_ck_concat(aTHX_ a)
@@ -4687,6 +4694,7 @@
 #define ck_substr(a)           Perl_ck_substr(aTHX_ a)
 #define ck_svconst(a)          Perl_ck_svconst(aTHX_ a)
 #define ck_trunc(a)            Perl_ck_trunc(aTHX_ a)
+#define ck_unpack(a)           Perl_ck_unpack(aTHX_ a)
 #define pp_aassign()           Perl_pp_aassign(aTHX)
 #define pp_abs()               Perl_pp_abs(aTHX)
 #define pp_accept()            Perl_pp_accept(aTHX)