From cfef31b27d1a56cda74e23698243f3be70bd9cb3 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jand@activestate.com>
Date: Wed, 21 Jul 2010 18:28:33 -0700
Subject: [PATCH] Get rid of PERL_POLLUTE

PERL_POLLUTE was added (but undefined by default) in 5.6 to optionally
expose older 5.005 symbols for backwards compatibility.  It's use was
always discouraged, and MakeMaker contains a more specific escape hatch:

    perl Makefile.PL POLLUTE=1

This can be used for modules that have not been upgraded to 5.6 naming
conventions (and really should be completely obsolete by now).
---
 embed.pl          | 12 ------------
 embedvar.h        | 33 ---------------------------------
 win32/Makefile    | 10 ----------
 win32/makefile.mk | 10 ----------
 4 files changed, 65 deletions(-)

diff --git a/embed.pl b/embed.pl
index 9c55cb4..fea46df 100755
--- a/embed.pl
+++ b/embed.pl
@@ -745,18 +745,6 @@ print $em <<'END';
 
 #endif /* PERL_GLOBAL_STRUCT */
 
-#ifdef PERL_POLLUTE		/* disabled by default in 5.6.0 */
-
-END
-
-for $sym (sort @extvars) {
-    print $em hide($sym,"PL_$sym");
-}
-
-print $em <<'END';
-
-#endif /* PERL_POLLUTE */
-
 /* ex: set ro: */
 END
 
diff --git a/embedvar.h b/embedvar.h
index dde1f27..25c033c 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -845,37 +845,4 @@
 
 #endif /* PERL_GLOBAL_STRUCT */
 
-#ifdef PERL_POLLUTE		/* disabled by default in 5.6.0 */
-
-#define DBassertion		PL_DBassertion
-#define DBsingle		PL_DBsingle
-#define DBsub			PL_DBsub
-#define compiling		PL_compiling
-#define curcop			PL_curcop
-#define curstash		PL_curstash
-#define debstash		PL_debstash
-#define defgv			PL_defgv
-#define diehook			PL_diehook
-#define dirty			PL_dirty
-#define dowarn			PL_dowarn
-#define errgv			PL_errgv
-#define na			PL_na
-#define no_modify		PL_no_modify
-#define perl_destruct_level	PL_perl_destruct_level
-#define perldb			PL_perldb
-#define ppaddr			PL_ppaddr
-#define rsfp			PL_rsfp
-#define rsfp_filters		PL_rsfp_filters
-#define stack_base		PL_stack_base
-#define stack_sp		PL_stack_sp
-#define stdingv			PL_stdingv
-#define sv_arenaroot		PL_sv_arenaroot
-#define sv_no			PL_sv_no
-#define sv_undef		PL_sv_undef
-#define sv_yes			PL_sv_yes
-#define tainted			PL_tainted
-#define tainting		PL_tainting
-
-#endif /* PERL_POLLUTE */
-
 /* ex: set ro: */
diff --git a/win32/Makefile b/win32/Makefile
index 33d920c..500d42a 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -204,16 +204,6 @@ BUILDOPT	= $(BUILDOPTEXTRA)
 #BUILDOPT	= $(BUILDOPT) -DNO_HASH_SEED
 
 #
-# This should normally be disabled.  Adding -DPERL_POLLUTE enables support
-# for old symbols by default, at the expense of extreme pollution.  You most
-# probably just want to build modules that won't compile with
-#         perl Makefile.PL POLLUTE=1
-# instead of enabling this.  Please report such modules to the respective
-# authors.
-#
-#BUILDOPT	= $(BUILDOPT) -DPERL_POLLUTE
-
-#
 # This should normally be disabled.  Enabling it will disable the File::Glob
 # implementation of CORE::glob.
 #
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2783772..c7053ff 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -258,16 +258,6 @@ BUILDOPT	*= $(BUILDOPTEXTRA)
 #BUILDOPT	+= -DNO_HASH_SEED
 
 #
-# This should normally be disabled.  Adding -DPERL_POLLUTE enables support
-# for old symbols by default, at the expense of extreme pollution.  You most
-# probably just want to build modules that won't compile with
-#         perl Makefile.PL POLLUTE=1
-# instead of enabling this.  Please report such modules to the respective
-# authors.
-#
-#BUILDOPT	+= -DPERL_POLLUTE
-
-#
 # This should normally be disabled.  Enabling it will disable the File::Glob
 # implementation of CORE::glob.
 #
-- 
2.7.4