Integrate mainline.

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

diff --git a/embed.h b/embed.h
index 2c0256f..7ffb796 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -411,7 +411,6 @@
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm           Perl_mem_collxfrm
 #endif
-#define memcmp_byte_utf8       Perl_memcmp_byte_utf8
 #define mess                   Perl_mess
 #define vmess                  Perl_vmess
 #define qerror                 Perl_qerror
@@ -534,6 +533,9 @@
 #if defined(USE_5005THREADS)
 #define new_struct_thread      Perl_new_struct_thread
 #endif
+#if defined(USE_REENTRANT_API)
+#define reentrant_init         Perl_reentrant_init
+#endif
 #define call_atexit            Perl_call_atexit
 #define call_argv              Perl_call_argv
 #define call_method            Perl_call_method
@@ -1970,7 +1972,6 @@
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm(a,b,c)    Perl_mem_collxfrm(aTHX_ a,b,c)
 #endif
-#define memcmp_byte_utf8(a,b,c,d)      Perl_memcmp_byte_utf8(aTHX_ a,b,c,d)
 #define vmess(a,b)             Perl_vmess(aTHX_ a,b)
 #define qerror(a)              Perl_qerror(aTHX_ a)
 #define sortsv(a,b,c)          Perl_sortsv(aTHX_ a,b,c)
@@ -2091,6 +2092,9 @@
 #if defined(USE_5005THREADS)
 #define new_struct_thread(a)   Perl_new_struct_thread(aTHX_ a)
 #endif
+#if defined(USE_REENTRANT_API)
+#define reentrant_init()       Perl_reentrant_init(aTHX)
+#endif
 #define call_atexit(a,b)       Perl_call_atexit(aTHX_ a,b)
 #define call_argv(a,b,c)       Perl_call_argv(aTHX_ a,b,c)
 #define call_method(a,b)       Perl_call_method(aTHX_ a,b)