From: Gurusamy Sarathy Date: Wed, 22 Apr 1998 03:13:19 +0000 (+0000) Subject: [win32] intern -> sys_intern X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9f699bd937481e601436dfa5b4c405c05ed9188f;p=p5sagit%2Fp5-mst-13.2.git [win32] intern -> sys_intern p4raw-id: //depot/win32/perl@895 --- diff --git a/embedvar.h b/embedvar.h index d6c3349..11ccca2 100644 --- a/embedvar.h +++ b/embedvar.h @@ -127,7 +127,7 @@ #define incgv (curinterp->Iincgv) #define initav (curinterp->Iinitav) #define inplace (curinterp->Iinplace) -#define intern (curinterp->Iintern) +#define sys_intern (curinterp->Isys_intern) #define lastfd (curinterp->Ilastfd) #define lastscream (curinterp->Ilastscream) #define lastsize (curinterp->Ilastsize) @@ -247,7 +247,7 @@ #define Iincgv incgv #define Iinitav initav #define Iinplace inplace -#define Iintern intern +#define Isys_intern sys_intern #define Ilastfd lastfd #define Ilastscream lastscream #define Ilastsize lastsize @@ -428,7 +428,7 @@ #define incgv Perl_incgv #define initav Perl_initav #define inplace Perl_inplace -#define intern Perl_intern +#define sys_intern Perl_sys_intern #define lastfd Perl_lastfd #define lastscream Perl_lastscream #define lastsize Perl_lastsize diff --git a/interp.sym b/interp.sym index fba6ba7..ce9ca77 100644 --- a/interp.sym +++ b/interp.sym @@ -58,7 +58,7 @@ in_eval incgv initav inplace -intern +sys_intern last_in_gv lastfd lastscream diff --git a/intrpvar.h b/intrpvar.h index 7c5ba76..c1a7b36 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -158,7 +158,7 @@ PERLVARI(Iexitlistlen, I32, 0) /* length of same */ PERLVAR(Imodglobal, HV *) /* per-interp module data */ #ifdef HAVE_INTERP_INTERN -PERLVAR(Iintern, struct interp_intern) /* platform internals */ +PERLVAR(Isys_intern, struct interp_intern) /* platform internals */ #endif #ifdef USE_THREADS diff --git a/win32/win32.h b/win32/win32.h index 9990caf..d2ac9b9 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -230,14 +230,14 @@ struct interp_intern { #endif }; -#define w32_perlshell_tokens (intern.w32_perlshell_tokens) -#define w32_perlshell_vec (intern.w32_perlshell_vec) -#define w32_perlshell_items (intern.w32_perlshell_items) -#define w32_fdpid (intern.w32_fdpid) +#define w32_perlshell_tokens (sys_intern.w32_perlshell_tokens) +#define w32_perlshell_vec (sys_intern.w32_perlshell_vec) +#define w32_perlshell_items (sys_intern.w32_perlshell_items) +#define w32_fdpid (sys_intern.w32_fdpid) #ifndef USE_RTL_WAIT -# define w32_num_children (intern.w32_num_children) -# define w32_child_pids (intern.w32_child_pids) +# define w32_num_children (sys_intern.w32_num_children) +# define w32_child_pids (sys_intern.w32_child_pids) #endif /*