add rsignal(), whichsig() and do_join() to public API list

(mod_perl uses them to good advantage)

p4raw-id: //depot/perl@5932

diff --git a/embed.pl b/embed.pl
index 952b7b8..eb7e38c 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -1447,7 +1447,7 @@ p |OP*    |die_where      |char* message|STRLEN msglen
 Ap     |void   |dounwind       |I32 cxix
 p      |bool   |do_aexec       |SV* really|SV** mark|SV** sp
 p      |bool   |do_aexec5      |SV* really|SV** mark|SV** sp|int fd|int flag
-Ap     |int    |do_binmode     |PerlIO *fp|int iotype|int flag
+Ap     |int    |do_binmode     |PerlIO *fp|int iotype|int mode
 p      |void   |do_chop        |SV* asv|SV* sv
 Ap     |bool   |do_close       |GV* gv|bool not_implicit
 p      |bool   |do_eof         |GV* gv
@@ -1464,7 +1464,7 @@ p |I32    |do_msgsnd      |SV** mark|SV** sp
 p      |I32    |do_semop       |SV** mark|SV** sp
 p      |I32    |do_shmio       |I32 optype|SV** mark|SV** sp
 #endif
-p      |void   |do_join        |SV* sv|SV* del|SV** mark|SV** sp
+Ap     |void   |do_join        |SV* sv|SV* del|SV** mark|SV** sp
 p      |OP*    |do_kv
 Ap     |bool   |do_open        |GV* gv|char* name|I32 len|int as_raw \
                                |int rawmode|int rawperm|PerlIO* supplied_fp
@@ -1860,7 +1860,7 @@ p |void   |regprop        |SV* sv|regnode* o
 Ap     |void   |repeatcpy      |char* to|const char* from|I32 len|I32 count
 Ap     |char*  |rninstr        |const char* big|const char* bigend \
                                |const char* little|const char* lend
-p      |Sighandler_t|rsignal   |int i|Sighandler_t t
+Ap     |Sighandler_t|rsignal   |int i|Sighandler_t t
 p      |int    |rsignal_restore|int i|Sigsave_t* t
 p      |int    |rsignal_save   |int i|Sighandler_t t1|Sigsave_t* t2
 p      |Sighandler_t|rsignal_state|int i
@@ -2055,7 +2055,7 @@ Ap        |void   |vwarn          |const char* pat|va_list* args
 Afp    |void   |warner         |U32 err|const char* pat|...
 Ap     |void   |vwarner        |U32 err|const char* pat|va_list* args
 p      |void   |watch          |char** addr
-p      |I32    |whichsig       |char* sig
+Ap     |I32    |whichsig       |char* sig
 p      |int    |yyerror        |char* s
 #if defined(USE_PURE_BISON)
 p      |int    |yylex          |YYSTYPE *lvalp|int *lcharp

diff --git a/global.sym b/global.sym
index 95e7775..8aca76e 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -88,6 +88,7 @@ Perl_die
 Perl_dounwind
 Perl_do_binmode
 Perl_do_close
+Perl_do_join
 Perl_do_open
 Perl_do_open9
 Perl_dowantarray
@@ -320,6 +321,7 @@ Perl_regexec_flags
 Perl_regnext
 Perl_repeatcpy
 Perl_rninstr
+Perl_rsignal
 Perl_savepv
 Perl_savepvn
 Perl_savestack_grow
@@ -463,6 +465,7 @@ Perl_warn
 Perl_vwarn
 Perl_warner
 Perl_vwarner
+Perl_whichsig
 Perl_dump_mstats
 Perl_get_mstats
 Perl_safesysmalloc

diff --git a/objXSUB.h b/objXSUB.h
index 68c31b0..8a0a81e 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -313,6 +313,10 @@
 #endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #endif
+#undef  Perl_do_join
+#define Perl_do_join           pPerl->Perl_do_join
+#undef  do_join
+#define do_join                        Perl_do_join
 #undef  Perl_do_open
 #define Perl_do_open           pPerl->Perl_do_open
 #undef  do_open
@@ -1279,6 +1283,10 @@
 #define Perl_rninstr           pPerl->Perl_rninstr
 #undef  rninstr
 #define rninstr                        Perl_rninstr
+#undef  Perl_rsignal
+#define Perl_rsignal           pPerl->Perl_rsignal
+#undef  rsignal
+#define rsignal                        Perl_rsignal
 #if !defined(HAS_RENAME)
 #endif
 #undef  Perl_savepv
@@ -1861,6 +1869,10 @@
 #define Perl_vwarner           pPerl->Perl_vwarner
 #undef  vwarner
 #define vwarner                        Perl_vwarner
+#undef  Perl_whichsig
+#define Perl_whichsig          pPerl->Perl_whichsig
+#undef  whichsig
+#define whichsig               Perl_whichsig
 #if defined(USE_PURE_BISON)
 #else
 #endif

diff --git a/perlapi.c b/perlapi.c
index 787c2f2..fc71fb3 100644 (file)
--- a/perlapi.c
+++ b/perlapi.c
@@ -616,9 +616,9 @@ Perl_dounwind(pTHXo_ I32 cxix)
 
 #undef  Perl_do_binmode
 int
-Perl_do_binmode(pTHXo_ PerlIO *fp, int iotype, int flag)
+Perl_do_binmode(pTHXo_ PerlIO *fp, int iotype, int mode)
 {
-    return ((CPerlObj*)pPerl)->Perl_do_binmode(fp, iotype, flag);
+    return ((CPerlObj*)pPerl)->Perl_do_binmode(fp, iotype, mode);
 }
 
 #undef  Perl_do_close
@@ -632,6 +632,13 @@ Perl_do_close(pTHXo_ GV* gv, bool not_implicit)
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #endif
 
+#undef  Perl_do_join
+void
+Perl_do_join(pTHXo_ SV* sv, SV* del, SV** mark, SV** sp)
+{
+    ((CPerlObj*)pPerl)->Perl_do_join(sv, del, mark, sp);
+}
+
 #undef  Perl_do_open
 bool
 Perl_do_open(pTHXo_ GV* gv, char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp)
@@ -2343,6 +2350,13 @@ Perl_rninstr(pTHXo_ const char* big, const char* bigend, const char* little, con
 {
     return ((CPerlObj*)pPerl)->Perl_rninstr(big, bigend, little, lend);
 }
+
+#undef  Perl_rsignal
+Sighandler_t
+Perl_rsignal(pTHXo_ int i, Sighandler_t t)
+{
+    return ((CPerlObj*)pPerl)->Perl_rsignal(i, t);
+}
 #if !defined(HAS_RENAME)
 #endif
 
@@ -3366,6 +3380,13 @@ Perl_vwarner(pTHXo_ U32 err, const char* pat, va_list* args)
 {
     ((CPerlObj*)pPerl)->Perl_vwarner(err, pat, args);
 }
+
+#undef  Perl_whichsig
+I32
+Perl_whichsig(pTHXo_ char* sig)
+{
+    return ((CPerlObj*)pPerl)->Perl_whichsig(sig);
+}
 #if defined(USE_PURE_BISON)
 #else
 #endif

diff --git a/proto.h b/proto.h
index 1be9992..454ca54 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -217,7 +217,7 @@ PERL_CALLCONV OP*   Perl_die_where(pTHX_ char* message, STRLEN msglen);
 PERL_CALLCONV void     Perl_dounwind(pTHX_ I32 cxix);
 PERL_CALLCONV bool     Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp);
 PERL_CALLCONV bool     Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int flag);
-PERL_CALLCONV int      Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int flag);
+PERL_CALLCONV int      Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode);
 PERL_CALLCONV void     Perl_do_chop(pTHX_ SV* asv, SV* sv);
 PERL_CALLCONV bool     Perl_do_close(pTHX_ GV* gv, bool not_implicit);
 PERL_CALLCONV bool     Perl_do_eof(pTHX_ GV* gv);