summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Peters <steve@fisharerojo.org>2006-08-17 14:50:36 +0000
committerSteve Peters <steve@fisharerojo.org>2006-08-17 14:50:36 +0000
commit063df69cb51d4f97ff5708b58e83b514bdd27cb7 (patch)
tree2d04fc6ffb5e9956b0a116300103a11c62f00aef
parent7ec40f37ce4eb8552b6149cba97968e51cedac3a (diff)
downloadperl-063df69cb51d4f97ff5708b58e83b514bdd27cb7.tar.gz
gcc-4.1.1 on Fedora optimized away NULL chacks in Perl_do_close(),
which caused core dumps. p4raw-id: //depot/perl@28731
-rw-r--r--embed.fnc2
-rw-r--r--proto.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/embed.fnc b/embed.fnc
index 0342c39368..e9c5da438a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -188,7 +188,7 @@ pmb |bool |do_aexec |NULLOK SV* really|NN SV** mark|NN SV** sp
p |bool |do_aexec5 |NULLOK SV* really|NN SV** mark|NN SV** sp|int fd|int do_report
Ap |int |do_binmode |NN PerlIO *fp|int iotype|int mode
p |void |do_chop |NN SV* asv|NN SV* sv
-Ap |bool |do_close |NN GV* gv|bool not_implicit
+Ap |bool |do_close |NULLOK GV* gv|bool not_implicit
p |bool |do_eof |NN GV* gv
#ifdef PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION
diff --git a/proto.h b/proto.h
index b73bd7056c..4d8e91baf6 100644
--- a/proto.h
+++ b/proto.h
@@ -405,9 +405,7 @@ PERL_CALLCONV void Perl_do_chop(pTHX_ SV* asv, SV* sv)
__attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_2);
-PERL_CALLCONV bool Perl_do_close(pTHX_ GV* gv, bool not_implicit)
- __attribute__nonnull__(pTHX_1);
-
+PERL_CALLCONV bool Perl_do_close(pTHX_ GV* gv, bool not_implicit);
PERL_CALLCONV bool Perl_do_eof(pTHX_ GV* gv)
__attribute__nonnull__(pTHX_1);