Integrate mainline

All but ../lib/Unicode/UCD.t pass.

p4raw-id: //depot/perlio@14412

1 files changed, 15 insertions, 5 deletions

diff --git a/embed.h b/embed.h
index 5f8b3ada2b..a84707b9f2 100644
--- a/embed.h
+++ b/embed.h
@@ -1,7 +1,15 @@
-/* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-   This file is built by embed.pl from data in embed.pl, pp.sym, intrpvar.h,
-   perlvars.h and thrdvar.h.  Any changes made here will be lost!
-*/
+/*
+ *    embed.h
+ *
+ *    Copyright (c) 1997-2002, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ *  !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
+ *  This file is built by embed.pl from data in embed.pl, pp.sym, intrpvar.h,
+ *  perlvars.h and thrdvar.h.  Any changes made here will be lost!
+ */
 
 /* (Doing namespace management portably in C is really gross.) */
 
@@ -1004,6 +1012,7 @@
 #define save_lines		S_save_lines
 #define doeval			S_doeval
 #define doopen_pmc		S_doopen_pmc
+#define path_is_absolute	S_path_is_absolute
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #define do_maybe_phash		S_do_maybe_phash
@@ -2542,6 +2551,7 @@
 #define save_lines(a,b)		S_save_lines(aTHX_ a,b)
 #define doeval(a,b)		S_doeval(aTHX_ a,b)
 #define doopen_pmc(a,b)		S_doopen_pmc(aTHX_ a,b)
+#define path_is_absolute(a)	S_path_is_absolute(aTHX_ a)
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #define do_maybe_phash(a,b,c,d,e)	S_do_maybe_phash(aTHX_ a,b,c,d,e)
@@ -2719,7 +2729,7 @@
 #  endif
 #endif
 #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
-#define isa_lookup(a,b,c,d)	S_isa_lookup(aTHX_ a,b,c,d)
+#define isa_lookup(a,b,c,d,e)	S_isa_lookup(aTHX_ a,b,c,d,e)
 #endif
 #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
 #define stdize_locale(a)	S_stdize_locale(aTHX_ a)