From 00dd722c5378e478eed4daa17120ab518ad2f0b8 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Mon, 29 Sep 2008 17:36:25 +0000
Subject: fix conflicts and merge in local changes to perl 5.10.0

---
 gnu/usr.bin/perl/globvar.sym | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/usr.bin/perl/globvar.sym')

diff --git a/gnu/usr.bin/perl/globvar.sym b/gnu/usr.bin/perl/globvar.sym
index e5928b839d7..24f8bcd4e72 100644
--- a/gnu/usr.bin/perl/globvar.sym
+++ b/gnu/usr.bin/perl/globvar.sym
@@ -3,7 +3,6 @@
 # *** Only structures/arrays with constant initializers should go here.
 # *** Usual globals initialized at runtime should be added in *var*.h.
 
-AMG_names
 block_type
 check
 fold
@@ -13,7 +12,6 @@ memory_wrap
 no_aelem
 no_dir_func
 no_func
-no_helem
 no_helem_sv
 no_localize_ref
 no_mem
@@ -29,6 +27,8 @@ op_name
 opargs
 ppaddr
 regkind
+reg_name
+reg_extflags_name
 sig_name
 sig_num
 simple
@@ -46,7 +46,6 @@ vtbl_defelem
 vtbl_env
 vtbl_envelem
 vtbl_fm
-vtbl_glob
 vtbl_isa
 vtbl_isaelem
 vtbl_mglob
@@ -70,3 +69,4 @@ warn_nl
 warn_nosemi
 warn_reserved
 warn_uninit
+watch_pvx
-- 
cgit v1.2.3