integrate change#3893, make it conditional on bincompat5005

p4raw-link: @3893 on //depot/cfgperl: 28dc62dc8a145e3aa6074d477ca4896dec6ede33

p4raw-id: //depot/perl@3894

diff --git a/makedef.pl b/makedef.pl
index a5e7f21..c98d161 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -10,6 +10,30 @@
 my $PLATFORM;
 my $CCTYPE;
 
+my %bincompat5005 =
+      (Perl_call_argv          =>      "perl_call_argv",
+       Perl_call_method                =>      "perl_call_method",
+       Perl_call_pv            =>      "perl_call_pv",
+       Perl_call_sv            =>      "perl_call_sv",
+       Perl_get_av             =>      "perl_get_av",
+       Perl_get_cv             =>      "perl_get_cv",
+       Perl_get_hv             =>      "perl_get_hv",
+       Perl_get_sv             =>      "perl_get_sv",
+       Perl_init_i18nl10n      =>      "perl_init_i18nl10n",
+       Perl_init_i18nl14n      =>      "perl_init_i18nl14n",
+       Perl_new_collate                =>      "perl_new_collate",
+       Perl_new_ctype          =>      "perl_new_ctype",
+       Perl_new_numeric                =>      "perl_new_numeric",
+       Perl_require_pv         =>      "perl_require_pv",
+       Perl_safesyscalloc      =>      "Perl_safecalloc",
+       Perl_safesysfree                =>      "Perl_safefree",
+       Perl_safesysmalloc      =>      "Perl_safemalloc",
+       Perl_safesysrealloc     =>      "Perl_saferealloc",
+       Perl_set_numeric_local  =>      "perl_set_numeric_local",
+       Perl_set_numeric_standard  =>   "perl_set_numeric_standard");
+
+my $bincompat5005 = join("|", keys %bincompat5005);
+
 while (@ARGV)
  {
   my $flag = shift;
@@ -68,6 +92,7 @@ while (<CFG>)
   $define{$1} = 1 if /^\s*#\s*define\s+(USE_THREADS)\b/;
   $define{$1} = 1 if /^\s*#\s*define\s+(USE_PERLIO)\b/;
   $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
+  $define{$1} = 1 if /^\s*#\s*define\s+(PERL_BINCOMPAT_5005)\b/;
  }
 close(CFG);
 
@@ -648,6 +673,8 @@ sub emit_symbol {
 
 sub output_symbol {
     my $symbol = shift;
+    $symbol = $bincompat5005{$symbol}
+       if $define{PERL_BINCOMPAT_5005} and $symbol =~ /^($bincompat5005)$/;
     if ($PLATFORM eq 'win32') {
        $symbol = "_$symbol" if $CCTYPE eq 'BORLAND';
        print "\t$symbol\n";