summaryrefslogtreecommitdiff
path: root/reentr.pl
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>2003-11-02 13:43:44 -0800
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2003-11-03 19:18:42 +0000
commitb3b3b51f2aca280525d4cb829ec224645bf84b5a (patch)
treec7afa1305076a037a46dc8004f25d6b5f0487139 /reentr.pl
parent2f65b2f0bd345fd58390bf7bbb7e2f9c96839f76 (diff)
downloadperl-b3b3b51f2aca280525d4cb829ec224645bf84b5a.tar.gz
Re: [PATCH 5.8.1] make reentr.[ch] compatible with 5.8.0 again
Message-ID: <8dqbqvg16ln2r807l1l2c905lh7hte303v@4ax.com> p4raw-id: //depot/perl@21645
Diffstat (limited to 'reentr.pl')
-rw-r--r--reentr.pl9
1 files changed, 4 insertions, 5 deletions
diff --git a/reentr.pl b/reentr.pl
index 339529fcdb..ef18bfaeac 100644
--- a/reentr.pl
+++ b/reentr.pl
@@ -480,13 +480,13 @@ EOF
EOF
} elsif ($1 eq 'random') {
push @struct, <<EOF;
-# if RANDOM_R_PROTO == REENTRANT_PROTO_iS
+# if RANDOM_R_PROTO == REENTRANT_PROTO_I_iS
int _${func}_retval;
# endif
-# if RANDOM_R_PROTO == REENTRANT_PROTO_lS
+# if RANDOM_R_PROTO == REENTRANT_PROTO_I_lS
long _${func}_retval;
# endif
-# if RANDOM_R_PROTO == REENTRANT_PROTO_tS
+# if RANDOM_R_PROTO == REENTRANT_PROTO_I_St
int32_t _${func}_retval;
# endif
EOF
@@ -679,7 +679,6 @@ EOF
$w = ", $w" if length $v;
}
my $call = "${func}_r($v$w)";
- $call = "((PL_reentrant_retint = $call))" if $r eq 'I' && $func ne 'random';
push @wrap, <<EOF;
# if !defined($func) && ${FUNC}_R_PROTO == REENTRANT_PROTO_$p
EOF
@@ -692,7 +691,7 @@ EOF
my $rv = $v ? ", $v" : "";
if ($r eq 'I') {
push @wrap, <<EOF;
-# define $func($v) ($call$test ? $true : (((PL_reentrant_retint > 0 && PL_reentrant_retint == ERANGE) || (errno == ERANGE)) ? Perl_reentrant_retry("$func"$rv) : 0))
+# define $func($v) ((PL_reentrant_retint = $call)$test ? $true : (((PL_reentrant_retint == ERANGE) || (errno == ERANGE)) ? Perl_reentrant_retry("$func"$rv) : 0))
EOF
} else {
push @wrap, <<EOF;