From f3dc127a728cf3f7200c6a1a89ee625c7781d94c Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Sun, 10 Feb 2008 17:44:34 +0000 Subject: [PATCH] vcroak()'s pattern is actually NULLOK. p4raw-id: //depot/perl@33272 --- embed.fnc | 2 +- proto.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/embed.fnc b/embed.fnc index 5d2f383..cc362b5 100644 --- a/embed.fnc +++ b/embed.fnc @@ -137,7 +137,7 @@ pR |OP* |convert |I32 optype|I32 flags|NULLOK OP* o pM |PERL_CONTEXT* |create_eval_scope|U32 flags : croak()'s first parm can be NULL. Otherwise, mod_perl breaks. Afprd |void |croak |NULLOK const char* pat|... -Apr |void |vcroak |NN const char* pat|NULLOK va_list* args +Apr |void |vcroak |NULLOK const char* pat|NULLOK va_list* args #if defined(PERL_IMPLICIT_CONTEXT) Afnrp |void |croak_nocontext|NN const char* pat|... Afnp |OP* |die_nocontext |NN const char* pat|... diff --git a/proto.h b/proto.h index d8ee5a4..de32d12 100644 --- a/proto.h +++ b/proto.h @@ -246,8 +246,7 @@ PERL_CALLCONV void Perl_croak(pTHX_ const char* pat, ...) __attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2); PERL_CALLCONV void Perl_vcroak(pTHX_ const char* pat, va_list* args) - __attribute__noreturn__ - __attribute__nonnull__(pTHX_1); + __attribute__noreturn__; #if defined(PERL_IMPLICIT_CONTEXT) PERL_CALLCONV void Perl_croak_nocontext(const char* pat, ...) -- 2.7.4