delete unused vars PL_av_fetch_sv, PL_hv_fetch_sv

and fix 'duplicate symbol' warnings from embed.pl
for utf8cache and sh_path

p4raw-id: //depot/perl@31246

diff --git a/embedvar.h b/embedvar.h
index adbfa1d..3ba2bfd 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -69,7 +69,6 @@
 #define PL_argvgv              (vTHX->Iargvgv)
 #define PL_argvout_stack       (vTHX->Iargvout_stack)
 #define PL_argvoutgv           (vTHX->Iargvoutgv)
-#define PL_av_fetch_sv         (vTHX->Iav_fetch_sv)
 #define PL_basetime            (vTHX->Ibasetime)
 #define PL_beginav             (vTHX->Ibeginav)
 #define PL_beginav_save                (vTHX->Ibeginav_save)
@@ -159,7 +158,6 @@
 #define PL_hintgv              (vTHX->Ihintgv)
 #define PL_hints               (vTHX->Ihints)
 #define PL_hv_fetch_ent_mh     (vTHX->Ihv_fetch_ent_mh)
-#define PL_hv_fetch_sv         (vTHX->Ihv_fetch_sv)
 #define PL_in_clean_all                (vTHX->Iin_clean_all)
 #define PL_in_clean_objs       (vTHX->Iin_clean_objs)
 #define PL_in_eval             (vTHX->Iin_eval)
@@ -393,7 +391,6 @@
 #define PL_Iargvgv             PL_argvgv
 #define PL_Iargvout_stack      PL_argvout_stack
 #define PL_Iargvoutgv          PL_argvoutgv
-#define PL_Iav_fetch_sv                PL_av_fetch_sv
 #define PL_Ibasetime           PL_basetime
 #define PL_Ibeginav            PL_beginav
 #define PL_Ibeginav_save       PL_beginav_save
@@ -483,7 +480,6 @@
 #define PL_Ihintgv             PL_hintgv
 #define PL_Ihints              PL_hints
 #define PL_Ihv_fetch_ent_mh    PL_hv_fetch_ent_mh
-#define PL_Ihv_fetch_sv                PL_hv_fetch_sv
 #define PL_Iin_clean_all       PL_in_clean_all
 #define PL_Iin_clean_objs      PL_in_clean_objs
 #define PL_Iin_eval            PL_in_eval

diff --git a/intrpvar.h b/intrpvar.h
index 0eb9fe2..3a171a6 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -135,11 +135,8 @@ PERLVAR(Istart_env,        JMPENV)         /* empty startup sigjmp environment */
 PERLVARI(Ierrors,      SV *,   NULL)   /* outstanding queued errors */
 
 /* statics "owned" by various functions */
-PERLVAR(Iav_fetch_sv,  SV *)           /* unused as of change #19268 */
-PERLVAR(Ihv_fetch_sv,  SV *)           /* unused as of change #19268 */
 PERLVAR(Ihv_fetch_ent_mh, HE*)         /* owned by hv_fetch_ent() */
 
-
 PERLVAR(Ilastgotoprobe,        OP*)            /* from pp_ctl.c */
 
 /* sort stuff */
@@ -483,10 +480,13 @@ PERLVARI(Icollation_standard, bool,       TRUE)
 
 
 #ifdef PERL_UTF8_CACHE_ASSERT
-PERLVARI(Iutf8cache, I8, -1)   /* Is the utf8 caching code enabled? */
+#  define PERL___I -1
 #else
-PERLVARI(Iutf8cache, I8, 1)    /* Is the utf8 caching code enabled? */
+#  define PERL___I -1
 #endif
+PERLVARI(Iutf8cache, I8, PERL___I)     /* Is the utf8 caching code enabled? */
+#undef PERL___I
+
 
 #ifdef USE_LOCALE_NUMERIC
 

diff --git a/perlapi.h b/perlapi.h
index 9ac642f..7007543 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -174,8 +174,6 @@ END_EXTERN_C
 #define PL_argvout_stack       (*Perl_Iargvout_stack_ptr(aTHX))
 #undef  PL_argvoutgv
 #define PL_argvoutgv           (*Perl_Iargvoutgv_ptr(aTHX))
-#undef  PL_av_fetch_sv
-#define PL_av_fetch_sv         (*Perl_Iav_fetch_sv_ptr(aTHX))
 #undef  PL_basetime
 #define PL_basetime            (*Perl_Ibasetime_ptr(aTHX))
 #undef  PL_beginav
@@ -354,8 +352,6 @@ END_EXTERN_C
 #define PL_hints               (*Perl_Ihints_ptr(aTHX))
 #undef  PL_hv_fetch_ent_mh
 #define PL_hv_fetch_ent_mh     (*Perl_Ihv_fetch_ent_mh_ptr(aTHX))
-#undef  PL_hv_fetch_sv
-#define PL_hv_fetch_sv         (*Perl_Ihv_fetch_sv_ptr(aTHX))
 #undef  PL_in_clean_all
 #define PL_in_clean_all                (*Perl_Iin_clean_all_ptr(aTHX))
 #undef  PL_in_clean_objs

diff --git a/perlvars.h b/perlvars.h
index 4970146..cd88e07 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -54,12 +54,15 @@ PERLVAR(Gop_mutex,  perl_mutex)     /* Mutex for op refcounting */
 PERLVAR(Gdollarzero_mutex, perl_mutex) /* Modifying $0 */
 #endif
 
+
 /* This is constant on most architectures, a global on OS/2 */
 #ifdef OS2
-PERLVARI(Gsh_path,           char *,   SH_PATH)/* full path of shell */
+#  define PERL___C
 #else
-PERLVARI(Gsh_path,     const char *,   SH_PATH)/* full path of shell */
+#  define PERL___C const
 #endif
+PERLVARI(Gsh_path,     PERL___C char *, SH_PATH) /* full path of shell */
+#undef PERL___C
 
 #ifndef PERL_MICRO
 /* If Perl has to ignore SIGPFE, this is its saved state.