change#2572 is not applicable; undo, retaining scan_bin addition

to global.sym

p4raw-link: @2572 on //depot/cfgperl: b002ae775153930d56eef6f15991f67590f4b473

p4raw-id: //depot/perl@2623

diff --git a/global.sym b/global.sym
index 09b2008..ff966b3 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -4,8 +4,6 @@
 
 Gv_AMupdate
 amagic_call
-amagic_cmp
-amagic_cmp_locale
 append_elem
 append_list
 apply

diff --git a/perl.c b/perl.c
index 0671004..95cb0d0 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -126,7 +126,6 @@ perl_construct(register PerlInterpreter *sv_interp)
            croak("panic: pthread_key_create");
 #endif
        MUTEX_INIT(&PL_sv_mutex);
-       MUTEX_INIT(&PL_cred_mutex);
        /*
         * Safe to use basic SV functions from now on (though
         * not things like mortals or tainting yet).
@@ -559,7 +558,6 @@ perl_destruct(register PerlInterpreter *sv_interp)
 #ifdef USE_THREADS
     MUTEX_DESTROY(&PL_strtab_mutex);
     MUTEX_DESTROY(&PL_sv_mutex);
-    MUTEX_DESTROY(&PL_cred_mutex);
     MUTEX_DESTROY(&PL_eval_mutex);
     MUTEX_DESTROY(&PL_cred_mutex);
     COND_DESTROY(&PL_eval_cond);

diff --git a/proto.h b/proto.h
index 051be92..333bd23 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -946,8 +946,6 @@ VIRTUAL void        sv_setsv_mg _((SV *dstr, SV *sstr));
 VIRTUAL void   sv_usepvn_mg _((SV *sv, char *ptr, STRLEN len));
 
 VIRTUAL MGVTBL*        get_vtbl _((int vtbl_id));
-VIRTUAL I32     amagic_cmp _((register SV *str1, register SV *str2));
-VIRTUAL I32     amagic_cmp_locale _((register SV *str1, register SV *str2));
 
 /* New virtual functions must be added here to maintain binary
  * compatablity with PERL_OBJECT