This should clear up 'Perl_do_exec' undefined; warnings on win32

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

diff --git a/proto.h b/proto.h
index f71e3d6..2050389 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -386,9 +386,17 @@ PERL_CALLCONV bool Perl_do_close(pTHX_ GV* gv, bool not_implicit)
 PERL_CALLCONV bool     Perl_do_eof(pTHX_ GV* gv)
                        __attribute__nonnull__(pTHX_1);
 
+
+#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
 /* PERL_CALLCONV bool  Perl_do_exec(pTHX_ const char* cmd)
                        __attribute__nonnull__(pTHX_1); */
 
+#else
+PERL_CALLCONV bool     Perl_do_exec(pTHX_ const char* cmd)
+                       __attribute__nonnull__(pTHX_1);
+
+#endif
+
 #if defined(WIN32) || defined(__SYMBIAN32__)
 PERL_CALLCONV int      Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp)
                        __attribute__nonnull__(pTHX_1)
@@ -684,8 +692,8 @@ PERL_CALLCONV SV*   Perl_hv_iterval(pTHX_ HV* tb, HE* entry)
 PERL_CALLCONV void     Perl_hv_ksplit(pTHX_ HV* hv, IV newmax)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void     Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how)
-                       __attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV void  Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how)
+                       __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV SV**     Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash);
 PERL_CALLCONV HE*      Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash);
@@ -883,8 +891,8 @@ PERL_CALLCONV STRLEN        Perl_is_utf8_char(pTHX_ const U8 *p)
 PERL_CALLCONV bool     Perl_is_utf8_string(pTHX_ const U8 *s, STRLEN len)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV bool     Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p)
-                       __attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV bool  Perl_is_utf8_string_loc(pTHX_ const U8 *s, STRLEN len, const U8 **p)
+                       __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV bool     Perl_is_utf8_string_loclen(pTHX_ const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
                        __attribute__nonnull__(pTHX_1);
@@ -2388,17 +2396,33 @@ PERL_CALLCONV UV        Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
 PERL_CALLCONV UV       Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
                        __attribute__nonnull__(pTHX_1);
 
+
+#ifdef EBCDIC
 PERL_CALLCONV UV       Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
                        __attribute__nonnull__(pTHX_1);
 
+#else
+/* PERL_CALLCONV UV    Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
+                       __attribute__nonnull__(pTHX_1); */
+
+#endif
+
 PERL_CALLCONV UV       Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
                        __attribute__nonnull__(pTHX_1);
 
+
+#ifdef EBCDIC
 PERL_CALLCONV U8*      Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV U8*      Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
-                       __attribute__nonnull__(pTHX_1);
+#else
+/* PERL_CALLCONV U8*   Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv)
+                       __attribute__nonnull__(pTHX_1); */
+
+#endif
+
+/* PERL_CALLCONV U8*   Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
+                       __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV U8*      Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
                        __attribute__nonnull__(pTHX_1);
@@ -2766,8 +2790,8 @@ PERL_CALLCONV int Perl_sv_release_IVX(pTHX_ SV *sv)
 #endif
 
 PERL_CALLCONV void     Perl_sv_nosharing(pTHX_ SV *);
-PERL_CALLCONV void     Perl_sv_nolocking(pTHX_ SV *);
-PERL_CALLCONV void     Perl_sv_nounlocking(pTHX_ SV *);
+/* PERL_CALLCONV void  Perl_sv_nolocking(pTHX_ SV *); */
+/* PERL_CALLCONV void  Perl_sv_nounlocking(pTHX_ SV *); */
 PERL_CALLCONV int      Perl_nothreadhook(pTHX);
 
 END_EXTERN_C
@@ -3697,9 +3721,7 @@ STATIC SV*        S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, SV *
                        __attribute__nonnull__(pTHX_4);
 
 #  if defined(DEBUGGING)
-STATIC int     S_tokereport(pTHX_ const char *s, I32 rv)
-                       __attribute__nonnull__(pTHX_1);
-
+STATIC int     S_tokereport(pTHX_ I32 rv);
 #  endif
 STATIC int     S_ao(pTHX_ int toketype);
 STATIC void    S_depcom(pTHX);