summaryrefslogtreecommitdiff
path: root/makedef.pl
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2002-07-18 03:26:10 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2002-07-18 03:26:10 +0000
commit78232bc06ee8f2056d0df2e16ccf05f417b0df87 (patch)
tree18d25a6be24d175bc6fb3f8ab15be4f3f5eb2e2c /makedef.pl
parenta472f20992c59c78d978c548ff03c69e1ea7dffe (diff)
downloadperl-78232bc06ee8f2056d0df2e16ccf05f417b0df87.tar.gz
Further OS/2 symbol tweaking.
p4raw-id: //depot/perl@17615
Diffstat (limited to 'makedef.pl')
-rw-r--r--makedef.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/makedef.pl b/makedef.pl
index 82000ae8bd..8986296390 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";