11792 wasn't complete

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

diff --git a/proto.h b/proto.h
index 06ce95a..e69c6f9 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -13,7 +13,7 @@ PERL_CALLCONV PerlInterpreter*        perl_alloc_using(struct IPerlMem* m, struct IPerl
 #endif
 PERL_CALLCONV PerlInterpreter* perl_alloc(void);
 PERL_CALLCONV void     perl_construct(PerlInterpreter* interp);
-PERL_CALLCONV void     perl_destruct(PerlInterpreter* interp);
+PERL_CALLCONV int      perl_destruct(PerlInterpreter* interp);
 PERL_CALLCONV void     perl_free(PerlInterpreter* interp);
 PERL_CALLCONV int      perl_run(PerlInterpreter* interp);
 PERL_CALLCONV int      perl_parse(PerlInterpreter* interp, XSINIT_t xsinit, int argc, char** argv, char** env);
@@ -101,7 +101,7 @@ PERL_CALLCONV UV    Perl_cast_uv(pTHX_ NV f);
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
 PERL_CALLCONV I32      Perl_my_chsize(pTHX_ int fd, Off_t length);
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV MAGIC*   Perl_condpair_magic(pTHX_ SV *sv);
 #endif
 PERL_CALLCONV OP*      Perl_convert(pTHX_ I32 optype, I32 flags, OP* o);
@@ -271,7 +271,7 @@ PERL_CALLCONV void  Perl_dump_sub(pTHX_ GV* gv);
 PERL_CALLCONV void     Perl_fbm_compile(pTHX_ SV* sv, U32 flags);
 PERL_CALLCONV char*    Perl_fbm_instr(pTHX_ unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags);
 PERL_CALLCONV char*    Perl_find_script(pTHX_ char *scriptname, bool dosearch, char **search_ext, I32 flags);
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV PADOFFSET        Perl_find_threadsv(pTHX_ const char *name);
 #endif
 PERL_CALLCONV OP*      Perl_force_list(pTHX_ OP* arg);
@@ -428,7 +428,7 @@ PERL_CALLCONV int   Perl_magic_gettaint(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_getuvar(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_getvec(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV U32      Perl_magic_len(pTHX_ SV* sv, MAGIC* mg);
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV int      Perl_magic_mutexfree(pTHX_ SV* sv, MAGIC* mg);
 #endif
 PERL_CALLCONV int      Perl_magic_nextpack(pTHX_ SV* sv, MAGIC* mg, SV* key);
@@ -601,7 +601,7 @@ PERL_CALLCONV void  Perl_free(pTHX);
 PERL_CALLCONV int      Perl_run(pTHX);
 PERL_CALLCONV int      Perl_parse(pTHX_ XSINIT_t xsinit, int argc, char** argv, char** env);
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV struct perl_thread*      Perl_new_struct_thread(pTHX_ struct perl_thread *t);
 #endif
 PERL_CALLCONV void     Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr);
@@ -826,7 +826,7 @@ PERL_CALLCONV UV    Perl_to_utf8_title(pTHX_ U8 *p);
 #if defined(UNLINK_ALL_VERSIONS)
 PERL_CALLCONV I32      Perl_unlnk(pTHX_ char* f);
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV void     Perl_unlock_condpair(pTHX_ void* svv);
 #endif
 PERL_CALLCONV void     Perl_unsharepvn(pTHX_ const char* sv, I32 len, U32 hash);
@@ -891,7 +891,7 @@ PERL_CALLCONV struct perl_vars *    Perl_GetVars(pTHX);
 #endif
 PERL_CALLCONV int      Perl_runops_standard(pTHX);
 PERL_CALLCONV int      Perl_runops_debug(pTHX);
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 PERL_CALLCONV SV*      Perl_sv_lock(pTHX_ SV *sv);
 #endif
 PERL_CALLCONV void     Perl_sv_catpvf_mg(pTHX_ SV *sv, const char* pat, ...)
@@ -984,6 +984,10 @@ PERL_CALLCONV void Perl_ptr_table_free(pTHX_ PTR_TBL_t *tbl);
 PERL_CALLCONV void     Perl_sys_intern_clear(pTHX);
 PERL_CALLCONV void     Perl_sys_intern_init(pTHX);
 #endif
+#if defined(PERL_CUSTOM_OPS)
+PERL_CALLCONV char *   Perl_custom_op_name(pTHX_ OP* op);
+PERL_CALLCONV char *   Perl_custom_op_desc(pTHX_ OP* op);
+#endif
 
 #if defined(PERL_OBJECT)
 protected:
@@ -1085,7 +1089,7 @@ STATIC void*      S_vrun_body(pTHX_ va_list args);
 STATIC void*   S_vcall_body(pTHX_ va_list args);
 STATIC void*   S_vcall_list_body(pTHX_ va_list args);
 #endif
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 STATIC struct perl_thread *    S_init_main_thread(pTHX);
 #  endif
 #endif