RE: [perl #37571] -z FH broken with Borland build

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

diff --git a/embed.h b/embed.h
index bd52baf..9105aea 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -165,6 +165,12 @@
 #ifdef PERL_CORE
 #define do_eof                 Perl_do_eof
 #endif
+#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
+#else
+#ifdef PERL_CORE
+#define do_exec                        Perl_do_exec
+#endif
+#endif
 #if defined(WIN32) || defined(__SYMBIAN32__)
 #define do_aspawn              Perl_do_aspawn
 #define do_spawn               Perl_do_spawn
@@ -884,10 +890,15 @@
 #define bytes_to_utf8          Perl_bytes_to_utf8
 #define utf8_to_uvchr          Perl_utf8_to_uvchr
 #define utf8_to_uvuni          Perl_utf8_to_uvuni
+#ifdef EBCDIC
 #define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#else
+#endif
 #define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#ifdef EBCDIC
 #define uvchr_to_utf8          Perl_uvchr_to_utf8
-#define uvuni_to_utf8          Perl_uvuni_to_utf8
+#else
+#endif
 #define uvchr_to_utf8_flags    Perl_uvchr_to_utf8_flags
 #define uvuni_to_utf8_flags    Perl_uvuni_to_utf8_flags
 #define pv_uni_display         Perl_pv_uni_display
@@ -1010,8 +1021,6 @@
 #endif
 #endif
 #define sv_nosharing           Perl_sv_nosharing
-#define sv_nolocking           Perl_sv_nolocking
-#define sv_nounlocking         Perl_sv_nounlocking
 #define nothreadhook           Perl_nothreadhook
 #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -2153,6 +2162,14 @@
 #ifdef PERL_CORE
 #define do_eof(a)              Perl_do_eof(aTHX_ a)
 #endif
+#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
+#ifdef PERL_CORE
+#endif
+#else
+#ifdef PERL_CORE
+#define do_exec(a)             Perl_do_exec(aTHX_ a)
+#endif
+#endif
 #if defined(WIN32) || defined(__SYMBIAN32__)
 #define do_aspawn(a,b,c)       Perl_do_aspawn(aTHX_ a,b,c)
 #define do_spawn(a)            Perl_do_spawn(aTHX_ a)
@@ -2863,10 +2880,15 @@
 #define bytes_to_utf8(a,b)     Perl_bytes_to_utf8(aTHX_ a,b)
 #define utf8_to_uvchr(a,b)     Perl_utf8_to_uvchr(aTHX_ a,b)
 #define utf8_to_uvuni(a,b)     Perl_utf8_to_uvuni(aTHX_ a,b)
+#ifdef EBCDIC
 #define utf8n_to_uvchr(a,b,c,d)        Perl_utf8n_to_uvchr(aTHX_ a,b,c,d)
+#else
+#endif
 #define utf8n_to_uvuni(a,b,c,d)        Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
+#ifdef EBCDIC
 #define uvchr_to_utf8(a,b)     Perl_uvchr_to_utf8(aTHX_ a,b)
-#define uvuni_to_utf8(a,b)     Perl_uvuni_to_utf8(aTHX_ a,b)
+#else
+#endif
 #define uvchr_to_utf8_flags(a,b,c)     Perl_uvchr_to_utf8_flags(aTHX_ a,b,c)
 #define uvuni_to_utf8_flags(a,b,c)     Perl_uvuni_to_utf8_flags(aTHX_ a,b,c)
 #define pv_uni_display(a,b,c,d,e)      Perl_pv_uni_display(aTHX_ a,b,c,d,e)
@@ -2984,8 +3006,6 @@
 #endif
 #endif
 #define sv_nosharing(a)                Perl_sv_nosharing(aTHX_ a)
-#define sv_nolocking(a)                Perl_sv_nolocking(aTHX_ a)
-#define sv_nounlocking(a)      Perl_sv_nounlocking(aTHX_ a)
 #define nothreadhook()         Perl_nothreadhook(aTHX)
 #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -3333,7 +3353,7 @@
 #endif
 #  if defined(DEBUGGING)
 #ifdef PERL_CORE
-#define tokereport(a,b)                S_tokereport(aTHX_ a,b)
+#define tokereport(a)          S_tokereport(aTHX_ a)
 #endif
 #  endif
 #ifdef PERL_CORE