perl 5.003_01: embed.h

Add banner warning to discourage direct changes to embed.h
Incorporate new symbols and name changes to reduce C namespace collisions

1 files changed, 36 insertions, 10 deletions

diff --git a/embed.h b/embed.h
index bfd73bd7f6..9d474835b3 100644
--- a/embed.h
+++ b/embed.h
@@ -1,4 +1,7 @@
-/* This file is derived from global.sym and interp.sym */
+/* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!! 
+   This file is derived from global.sym and interp.sym 
+   Any changes made here will be lost 
+*/
 
 /* (Doing namespace management portably in C is really gross.) */
 
@@ -41,6 +44,7 @@
 #define comppad		Perl_comppad
 #define comppad_name	Perl_comppad_name
 #define comppad_name_fill	Perl_comppad_name_fill
+#define comppad_name_floor	Perl_comppad_name_floor
 #define concat_amg	Perl_concat_amg
 #define concat_ass_amg	Perl_concat_ass_amg
 #define cop_seqmax	Perl_cop_seqmax
@@ -49,6 +53,7 @@
 #define cshlen		Perl_cshlen
 #define cshname		Perl_cshname
 #define curcop		Perl_curcop
+#define curcopdb	Perl_curcopdb
 #define curinterp	Perl_curinterp
 #define curpad		Perl_curpad
 #define dc		Perl_dc
@@ -161,6 +166,8 @@
 #define ppaddr		Perl_ppaddr
 #define profiledata	Perl_profiledata
 #define provide_ref	Perl_provide_ref
+#define psig_ptr	Perl_psig_ptr
+#define psig_name	Perl_psig_name
 #define qrt_amg		Perl_qrt_amg
 #define rcsid		Perl_rcsid
 #define reall_srchlen	Perl_reall_srchlen
@@ -172,7 +179,7 @@
 #define regeol		Perl_regeol
 #define regfold		Perl_regfold
 #define reginput	Perl_reginput
-#define regkind	Perl_regkind
+#define regkind		Perl_regkind
 #define reglastparen	Perl_reglastparen
 #define regmyendp	Perl_regmyendp
 #define regmyp_size	Perl_regmyp_size
@@ -219,7 +226,6 @@
 #define sle_amg		Perl_sle_amg
 #define slt_amg		Perl_slt_amg
 #define sne_amg		Perl_sne_amg
-#define stack		Perl_stack
 #define stack_base	Perl_stack_base
 #define stack_max	Perl_stack_max
 #define stack_sp	Perl_stack_sp
@@ -310,7 +316,6 @@
 #define cast_ulong	Perl_cast_ulong
 #define check_uni	Perl_check_uni
 #define checkcomma	Perl_checkcomma
-#define chsize		Perl_chsize
 #define ck_aelem	Perl_ck_aelem
 #define ck_concat	Perl_ck_concat
 #define ck_delete	Perl_ck_delete
@@ -426,6 +431,7 @@
 #define gv_fullname	Perl_gv_fullname
 #define gv_init		Perl_gv_init
 #define gv_stashpv	Perl_gv_stashpv
+#define gv_stashpvn	Perl_gv_stashpvn
 #define gv_stashsv	Perl_gv_stashsv
 #define he_delayfree	Perl_he_delayfree
 #define he_free		Perl_he_free
@@ -433,16 +439,21 @@
 #define hoistmust	Perl_hoistmust
 #define hv_clear	Perl_hv_clear
 #define hv_delete	Perl_hv_delete
+#define hv_delete_ent	Perl_hv_delete_ent
 #define hv_exists	Perl_hv_exists
+#define hv_exists_ent	Perl_hv_exists_ent
 #define hv_fetch	Perl_hv_fetch
+#define hv_fetch_ent	Perl_hv_fetch_ent
 #define hv_iterinit	Perl_hv_iterinit
 #define hv_iterkey	Perl_hv_iterkey
+#define hv_iterkeysv	Perl_hv_iterkeysv
 #define hv_iternext	Perl_hv_iternext
 #define hv_iternextsv	Perl_hv_iternextsv
 #define hv_iterval	Perl_hv_iterval
 #define hv_magic	Perl_hv_magic
 #define hv_stashpv	Perl_hv_stashpv
 #define hv_store	Perl_hv_store
+#define hv_store_ent	Perl_hv_store_ent
 #define hv_undef	Perl_hv_undef
 #define ibcmp		Perl_ibcmp
 #define ingroup		Perl_ingroup
@@ -461,12 +472,14 @@
 #define looks_like_number	Perl_looks_like_number
 #define magic_clearenv	Perl_magic_clearenv
 #define magic_clearpack	Perl_magic_clearpack
+#define magic_clearsig	Perl_magic_clearsig
 #define magic_existspack	Perl_magic_existspack
 #define magic_get	Perl_magic_get
 #define magic_getarylen	Perl_magic_getarylen
 #define magic_getglob	Perl_magic_getglob
 #define magic_getpack	Perl_magic_getpack
 #define magic_getpos	Perl_magic_getpos
+#define magic_getsig	Perl_magic_getsig
 #define magic_gettaint	Perl_magic_gettaint
 #define magic_getuvar	Perl_magic_getuvar
 #define magic_len	Perl_magic_len
@@ -506,6 +519,7 @@
 #define my		Perl_my
 #define my_bcopy	Perl_my_bcopy
 #define my_bzero	Perl_my_bzero
+#define my_chsize		Perl_my_chsize
 #define my_exit		Perl_my_exit
 #define my_htonl	Perl_my_htonl
 #define my_lstat	Perl_my_lstat
@@ -992,6 +1006,7 @@
 #define screaminstr	Perl_screaminstr
 #define setdefout	Perl_setdefout
 #define setenv_getix	Perl_setenv_getix
+#define sharepvn	Perl_sharepvn
 #define sighandler	Perl_sighandler
 #define skipspace	Perl_skipspace
 #define stack_grow	Perl_stack_grow
@@ -1059,6 +1074,7 @@
 #define too_few_arguments	Perl_too_few_arguments
 #define too_many_arguments	Perl_too_many_arguments
 #define unlnk		Perl_unlnk
+#define unsharepvn	Perl_unsharepvn
 #define utilize		Perl_utilize
 #define wait4pid	Perl_wait4pid
 #define warn		Perl_warn
@@ -1080,6 +1096,14 @@
 
 #ifdef MULTIPLICITY
 
+/* Undefine symbols that were defined by EMBED. Somewhat ugly */
+
+#undef curcop
+#undef envgv
+#undef siggv
+#undef stack
+#undef tainting
+
 #define Argv		(curinterp->IArgv)
 #define Cmd		(curinterp->ICmd)
 #define DBgv		(curinterp->IDBgv)
@@ -1100,8 +1124,10 @@
 #define copline		(curinterp->Icopline)
 #define curblock	(curinterp->Icurblock)
 #define curcop		(curinterp->Icurcop)
+#define curcopdb	(curinterp->Icurcopdb)
 #define curcsv		(curinterp->Icurcsv)
 #define curpm		(curinterp->Icurpm)
+#define curstack	(curinterp->Icurstack)
 #define curstash	(curinterp->Icurstash)
 #define curstname	(curinterp->Icurstname)
 #define cxstack		(curinterp->Icxstack)
@@ -1153,6 +1179,7 @@
 #define leftgv		(curinterp->Ileftgv)
 #define lineary		(curinterp->Ilineary)
 #define localizing	(curinterp->Ilocalizing)
+#define localpatches	(curinterp->Ilocalpatches)
 #define main_cv		(curinterp->Imain_cv)
 #define main_root	(curinterp->Imain_root)
 #define main_start	(curinterp->Imain_start)
@@ -1183,8 +1210,6 @@
 #define origfilename	(curinterp->Iorigfilename)
 #define ors		(curinterp->Iors)
 #define orslen		(curinterp->Iorslen)
-#define pad		(curinterp->Ipad)
-#define padname		(curinterp->Ipadname)
 #define parsehook	(curinterp->Iparsehook)
 #define patchlevel	(curinterp->Ipatchlevel)
 #define perldb		(curinterp->Iperldb)
@@ -1210,13 +1235,13 @@
 #define sortstack	(curinterp->Isortstack)
 #define sortstash	(curinterp->Isortstash)
 #define splitstr	(curinterp->Isplitstr)
-#define stack		(curinterp->Istack)
 #define statcache	(curinterp->Istatcache)
 #define statgv		(curinterp->Istatgv)
 #define statname	(curinterp->Istatname)
 #define statusvalue	(curinterp->Istatusvalue)
 #define stdingv		(curinterp->Istdingv)
 #define strchop		(curinterp->Istrchop)
+#define strtab		(curinterp->Istrtab)
 #define sv_count	(curinterp->Isv_count)
 #define sv_objcount	(curinterp->Isv_objcount)
 #define sv_root		(curinterp->Isv_root)
@@ -1254,8 +1279,10 @@
 #define Icopline	copline
 #define Icurblock	curblock
 #define Icurcop		curcop
+#define Icurcopdb	curcopdb
 #define Icurcsv		curcsv
 #define Icurpm		curpm
+#define Icurstack	curstack
 #define Icurstash	curstash
 #define Icurstname	curstname
 #define Icxstack	cxstack
@@ -1307,6 +1334,7 @@
 #define Ileftgv		leftgv
 #define Ilineary	lineary
 #define Ilocalizing	localizing
+#define Ilocalpatches	localpatches
 #define Imain_cv	main_cv
 #define Imain_root	main_root
 #define Imain_start	main_start
@@ -1337,8 +1365,6 @@
 #define Iorigfilename	origfilename
 #define Iors		ors
 #define Iorslen		orslen
-#define Ipad		pad
-#define Ipadname	padname
 #define Iparsehook	parsehook
 #define Ipatchlevel	patchlevel
 #define Iperldb		perldb
@@ -1364,13 +1390,13 @@
 #define Isortstack	sortstack
 #define Isortstash	sortstash
 #define Isplitstr	splitstr
-#define Istack		stack
 #define Istatcache	statcache
 #define Istatgv		statgv
 #define Istatname	statname
 #define Istatusvalue	statusvalue
 #define Istdingv	stdingv
 #define Istrchop	strchop
+#define Istrtab		strtab
 #define Isv_count	sv_count
 #define Isv_objcount	sv_objcount
 #define Isv_root	sv_root