X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.h;h=2885e22b7ddfd6643308079b77aa5ebc6550f6c8;hb=5d44bfff2e970064b1e107e564a35a3e07c5a058;hp=b2ea2849a6019b567870e17ff758637e844226aa;hpb=14333449d262b4fad02b614f81937e2c67a05581;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.h b/embed.h
index b2ea284..2885e22 100644
--- a/embed.h
+++ b/embed.h
@@ -188,6 +188,11 @@
 #ifdef PERL_CORE
 #define do_execfree		Perl_do_execfree
 #endif
+#ifdef PERL_IN_DOIO_C
+#ifdef PERL_CORE
+#define exec_failed		S_exec_failed
+#endif
+#endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #ifdef PERL_CORE
 #define do_ipcctl		Perl_do_ipcctl
@@ -1304,16 +1309,9 @@
 #define regpiece		S_regpiece
 #define reginsert		S_reginsert
 #define regtail			S_regtail
+#define join_exact		S_join_exact
 #define regwhite		S_regwhite
 #define nextchar		S_nextchar
-#endif
-#  ifdef DEBUGGING
-#if defined(PERL_CORE) || defined(PERL_EXT)
-#define dumpuntil		S_dumpuntil
-#define put_byte		S_put_byte
-#endif
-#  endif
-#if defined(PERL_CORE) || defined(PERL_EXT)
 #define scan_commit		S_scan_commit
 #define cl_anything		S_cl_anything
 #define cl_is_anything		S_cl_is_anything
@@ -1330,10 +1328,19 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define regpposixcc		S_regpposixcc
 #define checkposixcc		S_checkposixcc
+#define make_trie		S_make_trie
+#define make_trie_failtable	S_make_trie_failtable
 #endif
+#  ifdef DEBUGGING
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define make_trie		S_make_trie
+#define dumpuntil		S_dumpuntil
+#define put_byte		S_put_byte
+#define dump_trie		S_dump_trie
+#define dump_trie_interim_list	S_dump_trie_interim_list
+#define dump_trie_interim_table	S_dump_trie_interim_table
+#define regtail_study		S_regtail_study
 #endif
+#  endif
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_CORE) || defined(PERL_EXT)
@@ -1349,6 +1356,11 @@
 #define to_utf8_substr		S_to_utf8_substr
 #define to_byte_substr		S_to_byte_substr
 #endif
+#  ifdef DEBUGGING
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define dump_exec_pos		S_dump_exec_pos
+#endif
+#  endif
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
@@ -2356,6 +2368,11 @@
 #ifdef PERL_CORE
 #define do_execfree()		Perl_do_execfree(aTHX)
 #endif
+#ifdef PERL_IN_DOIO_C
+#ifdef PERL_CORE
+#define exec_failed(a,b,c)	S_exec_failed(aTHX_ a,b,c)
+#endif
+#endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 #ifdef PERL_CORE
 #define do_ipcctl(a,b,c)	Perl_do_ipcctl(aTHX_ a,b,c)
@@ -3461,27 +3478,20 @@
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define reg(a,b,c)		S_reg(aTHX_ a,b,c)
+#define reg(a,b,c,d)		S_reg(aTHX_ a,b,c,d)
 #define reganode(a,b,c)		S_reganode(aTHX_ a,b,c)
-#define regatom(a,b)		S_regatom(aTHX_ a,b)
-#define regbranch(a,b,c)	S_regbranch(aTHX_ a,b,c)
+#define regatom(a,b,c)		S_regatom(aTHX_ a,b,c)
+#define regbranch(a,b,c,d)	S_regbranch(aTHX_ a,b,c,d)
 #define reguni(a,b,c)		S_reguni(aTHX_ a,b,c)
-#define regclass(a)		S_regclass(aTHX_ a)
+#define regclass(a,b)		S_regclass(aTHX_ a,b)
 #define regcurly		S_regcurly
 #define reg_node(a,b)		S_reg_node(aTHX_ a,b)
-#define regpiece(a,b)		S_regpiece(aTHX_ a,b)
+#define regpiece(a,b,c)		S_regpiece(aTHX_ a,b,c)
 #define reginsert(a,b,c)	S_reginsert(aTHX_ a,b,c)
-#define regtail(a,b,c)		S_regtail(aTHX_ a,b,c)
+#define regtail(a,b,c,d)	S_regtail(aTHX_ a,b,c,d)
+#define join_exact(a,b,c,d,e,f)	S_join_exact(aTHX_ a,b,c,d,e,f)
 #define regwhite		S_regwhite
 #define nextchar(a)		S_nextchar(aTHX_ a)
-#endif
-#  ifdef DEBUGGING
-#if defined(PERL_CORE) || defined(PERL_EXT)
-#define dumpuntil(a,b,c,d,e,f)	S_dumpuntil(aTHX_ a,b,c,d,e,f)
-#define put_byte(a,b)		S_put_byte(aTHX_ a,b)
-#endif
-#  endif
-#if defined(PERL_CORE) || defined(PERL_EXT)
 #define scan_commit(a,b)	S_scan_commit(aTHX_ a,b)
 #define cl_anything		S_cl_anything
 #define cl_is_anything		S_cl_is_anything
@@ -3497,10 +3507,19 @@
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define regpposixcc(a,b)	S_regpposixcc(aTHX_ a,b)
 #define checkposixcc(a)		S_checkposixcc(aTHX_ a)
+#define make_trie(a,b,c,d,e,f,g)	S_make_trie(aTHX_ a,b,c,d,e,f,g)
+#define make_trie_failtable(a,b,c,d)	S_make_trie_failtable(aTHX_ a,b,c,d)
 #endif
+#  ifdef DEBUGGING
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define make_trie(a,b,c,d,e,f)	S_make_trie(aTHX_ a,b,c,d,e,f)
+#define dumpuntil(a,b,c,d,e,f)	S_dumpuntil(aTHX_ a,b,c,d,e,f)
+#define put_byte(a,b)		S_put_byte(aTHX_ a,b)
+#define dump_trie(a,b)		S_dump_trie(aTHX_ a,b)
+#define dump_trie_interim_list(a,b,c)	S_dump_trie_interim_list(aTHX_ a,b,c)
+#define dump_trie_interim_table(a,b,c)	S_dump_trie_interim_table(aTHX_ a,b,c)
+#define regtail_study(a,b,c,d)	S_regtail_study(aTHX_ a,b,c,d)
 #endif
+#  endif
 #endif
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
 #if defined(PERL_CORE) || defined(PERL_EXT)
@@ -3516,6 +3535,11 @@
 #define to_utf8_substr(a)	S_to_utf8_substr(aTHX_ a)
 #define to_byte_substr(a)	S_to_byte_substr(aTHX_ a)
 #endif
+#  ifdef DEBUGGING
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define dump_exec_pos(a,b,c)	S_dump_exec_pos(aTHX_ a,b,c)
+#endif
+#  endif
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE