From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Thu, 18 Jul 2002 03:26:10 +0000 (+0000)
Subject: Further OS/2 symbol tweaking.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=78232bc06ee8f2056d0df2e16ccf05f417b0df87;p=p5sagit%2Fp5-mst-13.2.git

Further OS/2 symbol tweaking.

p4raw-id: //depot/perl@17615
---

diff --git a/makedef.pl b/makedef.pl
index 82000ae..8986296 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -136,7 +136,7 @@ elsif ($PLATFORM eq 'os2') {
 	last if /^\s*EXPORTS\b/;
       }
       while (<$fh>) {
-	$ordinal{$1} = $2 if /^\s*"(\w+)"\s*\@(\d+)\s*$/;
+	$ordinal{$1} = $2 if /^\s*"(\w+)"\s*(?:=\s*"\w+"\s*)?\@(\d+)\s*$/;
 	# This allows skipping ordinals which were used in older versions
 	$sym_ord = $1 if /^\s*;\s*LAST_ORDINAL\s*=\s*(\d+)\s*$/;
       }
@@ -1350,10 +1350,10 @@ sub output_symbol {
     elsif ($PLATFORM eq 'os2') {
 	printf qq(    %-31s \@%s\n),
 	  qq("$symbol"), $ordinal{$symbol} || ++$sym_ord;
-	if (exists $exportperlmalloc{$symbol}) {
-	  printf qq(    %-31s \@%s\n),
-	    qq("$exportperlmalloc{$symbol}" = "$symbol"), ++$sym_ord;
-	}
+	printf qq(    %-31s \@%s\n),
+	  qq("$exportperlmalloc{$symbol}" = "$symbol"),
+	  $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord
+	  if $exportperlmalloc and exists $exportperlmalloc{$symbol};
     }
     elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
 	print "$symbol\n";