blead 25801: Symbian batch of today

[p5sagit/p5-mst-13.2.git] / embed.fnc

diff --git a/embed.fnc b/embed.fnc
index 929fe5b..a63fda8 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -128,7 +128,8 @@ ApR |UV     |cast_uv        |NV f
 ApR    |I32    |my_chsize      |int fd|Off_t length
 #endif
 pR     |OP*    |convert        |I32 optype|I32 flags|NULLOK OP* o
-Afprd  |void   |croak          |NN const char* pat|...
+: 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
 #if defined(PERL_IMPLICIT_CONTEXT)
 Afnrp  |void   |croak_nocontext|NN const char* pat|...
@@ -183,7 +184,7 @@ p   |void   |do_chop        |NN SV* asv|NN SV* sv
 Ap     |bool   |do_close       |NN GV* gv|bool not_implicit
 p      |bool   |do_eof         |NN GV* gv
 p      |bool   |do_exec        |NN const char* cmd
-#if defined(WIN32) || defined(SYMBIAN)
+#if defined(WIN32) || defined(__SYMBIAN32__)
 Ap     |int    |do_aspawn      |NN SV* really|NN SV** mark|NN SV** sp
 Ap     |int    |do_spawn       |NN char* cmd
 Ap     |int    |do_spawn_nowait|NN char* cmd
@@ -645,8 +646,8 @@ p   |void   |rxres_save     |NN void** rsp|NN REGEXP* prx
 #if !defined(HAS_RENAME)
 p      |I32    |same_dirent    |NN const char* a|NN const char* b
 #endif
-Apda   |char*  |savepv         |NN const char* pv
-Apda   |char*  |savepvn        |NN const char* pv|I32 len
+Apda   |char*  |savepv         |NULLOK const char* pv
+Apda   |char*  |savepvn        |NULLOK const char* pv|I32 len
 Apda   |char*  |savesharedpv   |NULLOK const char* pv
 Apda   |char*  |savesvpv       |NN SV* sv
 Ap     |void   |savestack_grow
@@ -659,7 +660,7 @@ Ap  |void   |save_bool      |NN bool* boolp
 Ap     |void   |save_clearsv   |NN SV** svp
 Ap     |void   |save_delete    |NN HV* hv|NN char* key|I32 klen
 Ap     |void   |save_destructor|DESTRUCTORFUNC_NOCONTEXT_t f|NN void* p
-Ap     |void   |save_destructor_x|DESTRUCTORFUNC_t f|NN void* p
+Ap     |void   |save_destructor_x|DESTRUCTORFUNC_t f|NULLOK void* p
 Ap     |void   |save_freesv    |NULLOK SV* sv
 p      |void   |save_freeop    |NULLOK OP* o
 Ap     |void   |save_freepv    |NULLOK char* pv
@@ -715,7 +716,7 @@ np  |Signal_t |sighandler   |int sig
 Anp    |Signal_t |csighandler  |int sig
 #endif
 Ap     |SV**   |stack_grow     |NN SV** sp|NN SV**p|int n
-ApR    |I32    |start_subparse |I32 is_format|U32 flags
+Ap     |I32    |start_subparse |I32 is_format|U32 flags
 p      |void   |sub_crush_depth|NN CV* cv
 Apd    |bool   |sv_2bool       |NN SV* sv
 Apd    |CV*    |sv_2cv         |NULLOK SV* sv|NN HV** st|NN GV** gvp|I32 lref
@@ -760,7 +761,7 @@ Apd |int    |getcwd_sv      |NN SV* sv
 Apd    |void   |sv_dec         |NN SV* sv
 Ap     |void   |sv_dump        |NN SV* sv
 ApdR   |bool   |sv_derived_from|NN SV* sv|NN const char* name
-Apd    |I32    |sv_eq          |NN SV* sv1|NN SV* sv2
+Apd    |I32    |sv_eq          |NULLOK SV* sv1|NULLOK SV* sv2
 Apd    |void   |sv_free        |NULLOK SV* sv
 poMX   |void   |sv_free2       |NN SV* sv
 pd     |void   |sv_free_arenas