Move the proto of start_glob() to a better place; regen api files.

p4raw-id: //depot/perl@8101

diff --git a/embed.h b/embed.h
index c3a58bc..70d4c36 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1145,8 +1145,6 @@
 #define xstat                  S_xstat
 #  endif
 #endif
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-#endif
 #if defined(PERL_OBJECT)
 #endif
 #define ck_anoncode            Perl_ck_anoncode
@@ -2605,8 +2603,6 @@
 #define xstat(a)               S_xstat(aTHX_ a)
 #  endif
 #endif
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-#endif
 #if defined(PERL_OBJECT)
 #endif
 #define ck_anoncode(a)         Perl_ck_anoncode(aTHX_ a)
@@ -3865,6 +3861,8 @@
 #define pad_swipe              Perl_pad_swipe
 #define Perl_peep              CPerlObj::Perl_peep
 #define peep                   Perl_peep
+#define Perl_start_glob                CPerlObj::Perl_start_glob
+#define start_glob             Perl_start_glob
 #if defined(PERL_OBJECT)
 #define Perl_construct         CPerlObj::Perl_construct
 #define Perl_destruct          CPerlObj::Perl_destruct
@@ -5054,10 +5052,6 @@
 #define xstat                  S_xstat
 #  endif
 #endif
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-#define Perl_start_glob                CPerlObj::Perl_start_glob
-#define start_glob             Perl_start_glob
-#endif
 #if defined(PERL_OBJECT)
 #endif
 #define Perl_ck_anoncode       CPerlObj::Perl_ck_anoncode

diff --git a/embed.pl b/embed.pl
index 8664fc7..fa22c84 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -1828,6 +1828,7 @@ p |void   |pad_free       |PADOFFSET po
 p      |void   |pad_reset
 p      |void   |pad_swipe      |PADOFFSET po
 p      |void   |peep           |OP* o
+dopM   |PerlIO*|start_glob     |SV* pattern|IO *io
 #if defined(PERL_OBJECT)
 Aox    |void   |Perl_construct
 Aox    |void   |Perl_destruct
@@ -2532,10 +2533,6 @@ s        |void   |xstat          |int
 #  endif
 #endif
 
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-dopM   |PerlIO*|start_glob     |SV* pattern|IO *io
-#endif
-
 #if defined(PERL_OBJECT)
 };
 #endif

diff --git a/objXSUB.h b/objXSUB.h
index 7886503..5a3850c 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -2307,8 +2307,6 @@
 #  if defined(LEAKTEST)
 #  endif
 #endif
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-#endif
 #if defined(PERL_OBJECT)
 #endif
 

diff --git a/perlapi.c b/perlapi.c
index e2df18e..dc6228f 100644 (file)
--- a/perlapi.c
+++ b/perlapi.c
@@ -2017,7 +2017,7 @@ Perl_newSVpvn(pTHXo_ const char* s, STRLEN len)
 
 #undef  Perl_newSVpvn_share
 SV*
-Perl_newSVpvn_share(pTHXo_ const char* s, STRLEN len, U32 hash)
+Perl_newSVpvn_share(pTHXo_ const char* s, I32 len, U32 hash)
 {
     return ((CPerlObj*)pPerl)->Perl_newSVpvn_share(s, len, hash);
 }

diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index cf7c5db..ff01f97 100644 (file)
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -1283,7 +1283,7 @@ The idea here is that as string table is used for shared hash
 keys these strings will have SvPVX == HeKEY and hash lookup
 will avoid string compare.
 
-       SV*     newSVpvn_share(const char* s, STRLEN len, U32 hash)
+       SV*     newSVpvn_share(const char* s, I32 len, U32 hash)
 
 =for hackers
 Found in file sv.c
@@ -1443,7 +1443,7 @@ Found in file perl.c
 =item PL_DBsingle
 
 When Perl is run in debugging mode, with the B<-d> switch, this SV is a
-boolean which indicates whether subs are being single-stepped. 
+boolean which indicates whether subs are being single-stepped.
 Single-stepping is automatically turned on after every step.  This is the C
 variable which corresponds to Perl's $DB::single variable.  See
 C<PL_DBsub>.
@@ -1487,10 +1487,10 @@ Found in file intrpvar.h
 
 =item PL_modglobal
 
-C<PL_modglobal> is a general purpose, interpreter global HV for use by 
+C<PL_modglobal> is a general purpose, interpreter global HV for use by
 extensions that need to keep information on a per-interpreter basis.
-In a pinch, it can also be used as a symbol table for extensions 
-to share data among each other.  It is a good idea to use keys 
+In a pinch, it can also be used as a symbol table for extensions
+to share data among each other.  It is a good idea to use keys
 prefixed by the package name of the extension that owns the data.
 
        HV*     PL_modglobal
@@ -3064,7 +3064,7 @@ Found in file sv.c
 Unsets the RV status of the SV, and decrements the reference count of
 whatever was being referenced by the RV.  This can almost be thought of
 as a reversal of C<newSVrv>.  This is C<sv_unref_flags> with the C<flag>
-being zero.  See C<SvROK_off>.  
+being zero.  See C<SvROK_off>.
 
        void    sv_unref(SV* sv)
 
@@ -3079,7 +3079,7 @@ as a reversal of C<newSVrv>.  The C<cflags> argument can contain
 C<SV_IMMEDIATE_UNREF> to force the reference count to be decremented
 (otherwise the decrementing is conditional on the reference count being
 different from one or the reference being a readonly SV).
-See C<SvROK_off>.  
+See C<SvROK_off>.
 
        void    sv_unref_flags(SV* sv, U32 flags)
 

diff --git a/proto.h b/proto.h
index 451c5b2..288a311 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -572,6 +572,7 @@ PERL_CALLCONV void  Perl_pad_free(pTHX_ PADOFFSET po);
 PERL_CALLCONV void     Perl_pad_reset(pTHX);
 PERL_CALLCONV void     Perl_pad_swipe(pTHX_ PADOFFSET po);
 PERL_CALLCONV void     Perl_peep(pTHX_ OP* o);
+PERL_CALLCONV PerlIO*  Perl_start_glob(pTHX_ SV* pattern, IO *io);
 #if defined(PERL_OBJECT)
 PERL_CALLCONV void     Perl_construct(pTHX);
 PERL_CALLCONV void     Perl_destruct(pTHX);
@@ -1268,10 +1269,6 @@ STATIC void      S_xstat(pTHX_ int);
 #  endif
 #endif
 
-#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
-PERL_CALLCONV PerlIO*  Perl_start_glob(pTHX_ SV* pattern, IO *io);
-#endif
-
 #if defined(PERL_OBJECT)
 };
 #endif