summaryrefslogtreecommitdiff
path: root/gv.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2008-05-10 14:15:40 +0000
committerNicholas Clark <nick@ccl4.org>2008-05-10 14:15:40 +0000
commit64d45388254280d7863c7b179b780a653cb2a423 (patch)
treef6ba393b14f60b2b95f5ae02c89d666acc518e76 /gv.c
parent56d5c1cc7f6eacb87ccdf7a0cc8311dfd1430c17 (diff)
downloadperl-64d45388254280d7863c7b179b780a653cb2a423.tar.gz
Integrate:
[ 33665] Subject: [PATCH] is_gv_magical correctly check "ISA" From: Gerard Goossen <gerard@tty.nl> Date: Wed, 9 Apr 2008 12:12:44 +0200 Message-ID: <20080409101244.GA11209@ostwald> [ 33741] Inline the trivial S_raise_signal function in the perl signal handler. This makes the code more readable and avoids the need for excuses for why the function is (still) named this way. It also effectively avoids segfaults observed with gcc-3.3 when the sibling-call optimization is used for invoking S_raise_signal() just before the signal handler returns. [ 33762] Cast the result of fpsetmask(0) to (void), as some implementations expand it via a macro, with a comma expression to calculate the return value, at which point gcc has the gall to warn that an expression calcualted is not used. Blame SCO for having to have fpsetmask(0) in the code to start with. [ 33763] Subject: [PATCH] Win32 process ids can have more than 16 bits From: "Jan Dubois" <jand@activestate.com> Date: Tue, 29 Apr 2008 01:14:39 -0700 Message-ID: <01be01c8a9d1$12b32b10$38198130$@com> [ 33788] Record-style reads in Perl_sv_gets have to be done with read(), not fread() on VMS, and have been for some time. Except that ain't gonna work with PerlIO::Scalar's in-memory files. Old bug exposed by new test in #33769. p4raw-link: @33788 on //depot/perl: 048d9da8ec2370ce3e00d2fda9649ad63736ab2f p4raw-link: @33763 on //depot/perl: 40c7cc6dda502ce0119863824290b6aa3c979bb0 p4raw-link: @33762 on //depot/perl: ad3a8c6706bd3a6f37807bfeb97ae631d2828ec9 p4raw-link: @33741 on //depot/perl: 406878dddec0512d5dbd1942add8ab7e9ea12a7a p4raw-link: @33665 on //depot/perl: f2df708187f7170c3344b7542e7aa96faa0b2fd8 p4raw-id: //depot/maint-5.10/perl@33802 p4raw-integrated: from //depot/perl@33801 'merge in' win32/win32.c (@33566..) perl.h (@33629..) sv.c (@33669..) mg.c (@33739..) p4raw-integrated: from //depot/perl@33665 'merge in' gv.c (@33304..)
Diffstat (limited to 'gv.c')
-rw-r--r--gv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gv.c b/gv.c
index ebcfabb076..5be19f2d94 100644
--- a/gv.c
+++ b/gv.c
@@ -2157,7 +2157,7 @@ Perl_is_gv_magical(pTHX_ const char *name, STRLEN len, U32 flags)
const char * const name1 = name + 1;
switch (*name) {
case 'I':
- if (len == 3 && name1[1] == 'S' && name[2] == 'A')
+ if (len == 3 && name[1] == 'S' && name[2] == 'A')
goto yes;
break;
case 'O':