eliminate dup hunk from integration

p4raw-id: //depot/perl@2319

diff --git a/lib/filetest.pm b/lib/filetest.pm
index fe1777e..65fc170 100644 (file)
--- a/lib/filetest.pm
+++ b/lib/filetest.pm
@@ -32,7 +32,7 @@ There may be a slight performance decrease in the filetests
 when C<use filetest> is in effect, because in some systems
 the extended functionality needs to be emulated.
 
-B<NOTE>: using the file tests for security purposes is a lost case
+B<NOTE>: using the file tests for security purposes is a lost cause
 from the start: there is a window open for race conditions (who is to
 say that the permissions will not change between the test and the real
 operation?).  Therefore if you are serious about security, just try

diff --git a/perl.h b/perl.h
index 101c316..7486c16 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -2185,41 +2185,6 @@ enum {           /* pass one of these to get_vtbl */
     want_vtbl_regdatum
 };
 
-enum {         /* pass one of these to get_vtbl */
-    want_vtbl_sv,
-    want_vtbl_env,
-    want_vtbl_envelem,
-    want_vtbl_sig,
-    want_vtbl_sigelem,
-    want_vtbl_pack,
-    want_vtbl_packelem,
-    want_vtbl_dbline,
-    want_vtbl_isa,
-    want_vtbl_isaelem,
-    want_vtbl_arylen,
-    want_vtbl_glob,
-    want_vtbl_mglob,
-    want_vtbl_nkeys,
-    want_vtbl_taint,
-    want_vtbl_substr,
-    want_vtbl_vec,
-    want_vtbl_pos,
-    want_vtbl_bm,
-    want_vtbl_fm,
-    want_vtbl_uvar,
-    want_vtbl_defelem,
-    want_vtbl_regexp,
-    want_vtbl_collxfrm,
-    want_vtbl_amagic,
-    want_vtbl_amagicelem,
-#ifdef USE_THREADS
-    want_vtbl_mutex,
-#endif
-    want_vtbl_regdata,
-    want_vtbl_regdatum
-};
-
-
                                /* Note: the lowest 8 bits are reserved for
                                   stuffing into op->op_private */
 #define HINT_INTEGER           0x00000001