From: Steve Hay Date: Wed, 2 May 2007 11:22:19 +0000 (+0000) Subject: Fix threaded builds (broken by change #31112) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=08ea85ebb7e662ede09f8aeca53b33a16b8e6a1e;p=p5sagit%2Fp5-mst-13.2.git Fix threaded builds (broken by change #31112) p4raw-link: @31112 on //depot/perl: 3497a01ff49c0a24f2db9e69c6bb89e36e940ed4 p4raw-id: //depot/perl@31115 --- diff --git a/embed.fnc b/embed.fnc index 16b75b1..8fc1aa3 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1585,7 +1585,7 @@ Apd |char* |sv_pvn_force_flags|NN SV* sv|NULLOK STRLEN* lp|I32 flags Apd |void |sv_copypv |NN SV* dsv|NN SV* ssv Ap |char* |my_atof2 |NN const char *s|NN NV* value Apn |int |my_socketpair |int family|int type|int protocol|int fd[2] -Apn |int |my_dirfd |NULLOK DIR* dir +Ap |int |my_dirfd |NULLOK DIR* dir #ifdef PERL_OLD_COPY_ON_WRITE pMXE |SV* |sv_setsv_cow |NN SV* dsv|NN SV* ssv #endif diff --git a/embed.h b/embed.h index f73e55b..9952dd1 100644 --- a/embed.h +++ b/embed.h @@ -3854,7 +3854,7 @@ #define sv_copypv(a,b) Perl_sv_copypv(aTHX_ a,b) #define my_atof2(a,b) Perl_my_atof2(aTHX_ a,b) #define my_socketpair Perl_my_socketpair -#define my_dirfd Perl_my_dirfd +#define my_dirfd(a) Perl_my_dirfd(aTHX_ a) #ifdef PERL_OLD_COPY_ON_WRITE #if defined(PERL_CORE) || defined(PERL_EXT) #define sv_setsv_cow(a,b) Perl_sv_setsv_cow(aTHX_ a,b) diff --git a/proto.h b/proto.h index 85e1d4c..7cb0ce7 100644 --- a/proto.h +++ b/proto.h @@ -4197,7 +4197,7 @@ PERL_CALLCONV char* Perl_my_atof2(pTHX_ const char *s, NV* value) __attribute__nonnull__(pTHX_2); PERL_CALLCONV int Perl_my_socketpair(int family, int type, int protocol, int fd[2]); -PERL_CALLCONV int Perl_my_dirfd(DIR* dir); +PERL_CALLCONV int Perl_my_dirfd(pTHX_ DIR* dir); #ifdef PERL_OLD_COPY_ON_WRITE PERL_CALLCONV SV* Perl_sv_setsv_cow(pTHX_ SV* dsv, SV* ssv) __attribute__nonnull__(pTHX_1) diff --git a/util.c b/util.c index 2ec3940..81551f6 100644 --- a/util.c +++ b/util.c @@ -5808,7 +5808,7 @@ Perl_get_db_sub(pTHX_ SV **svp, CV *cv) } int -Perl_my_dirfd(DIR * dir) { +Perl_my_dirfd(pTHX_ DIR * dir) { /* Most dirfd implementations have problems when passed NULL. */ if(!dir)