diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-05-05 12:09:48 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-05-05 12:18:11 +0200 |
| commit | 9de654f174a7c7ca88031e2ac4a33add560d0c8c (patch) | |
| tree | 7763181344f0e6240e96c5a444c8a5b57c986dc8 /proto.h | |
| parent | f1bef09e9115ebdc1c8818193d6c4cbb8bc050e6 (diff) | |
| parent | 216e7dec1076aa94d5b8331c187c135e4952955a (diff) | |
| download | perl-9de654f174a7c7ca88031e2ac4a33add560d0c8c.tar.gz | |
Merge branch 'blead' into smartmatch
Conflicts:
t/op/switch.t
Diffstat (limited to 'proto.h')
| -rw-r--r-- | proto.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -4028,7 +4028,6 @@ PERL_CALLCONV OP * Perl_my_attrs(pTHX_ OP *o, OP *attrs) #define PERL_ARGS_ASSERT_MY_ATTRS \ assert(o) -PERL_CALLCONV void Perl_boot_core_xsutils(pTHX); #if defined(USE_ITHREADS) PERL_CALLCONV PERL_CONTEXT* Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, CLONE_PARAMS* param) __attribute__warn_unused_result__ @@ -5968,10 +5967,9 @@ PERL_CALLCONV int Perl_my_socketpair(int family, int type, int protocol, int fd[ PERL_CALLCONV int Perl_my_dirfd(pTHX_ DIR* dir); #ifdef PERL_OLD_COPY_ON_WRITE PERL_CALLCONV SV* Perl_sv_setsv_cow(pTHX_ SV* dstr, SV* sstr) - __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETSV_COW \ - assert(dstr); assert(sstr) + assert(sstr) #endif |