summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Peters <steve@fisharerojo.org>2006-05-01 23:25:30 +0000
committerSteve Peters <steve@fisharerojo.org>2006-05-01 23:25:30 +0000
commit74d5ed12f2c8cab97d22a9affcb3e8e87bad2b7b (patch)
tree27dbb4ce2e86189b8ef20a73d865809ce0b246c5
parenta6fd7f3f0e271856b7ecf5cd1e2906924a6b206a (diff)
downloadperl-74d5ed12f2c8cab97d22a9affcb3e8e87bad2b7b.tar.gz
Reverting context removal from change #27992. This should
clear up threaded builds on Win32 and VMS. p4raw-link: @27992 on //depot/perl: df528165173896ed88fc3da7e1aa8bc3ef3b2416 p4raw-id: //depot/perl@28041
-rw-r--r--embed.fnc2
-rw-r--r--embed.h2
-rw-r--r--pp_ctl.c2
-rw-r--r--proto.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/embed.fnc b/embed.fnc
index a1ae02f40a..55f65fbd37 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1237,7 +1237,7 @@ sR |I32 |dopoptosub_at |NN const PERL_CONTEXT* cxstk|I32 startingblock
sR |I32 |dopoptowhen |I32 startingblock
s |void |save_lines |NULLOK AV *array|NN SV *sv
sR |OP* |doeval |int gimme|NULLOK OP** startop|NULLOK CV* outside|U32 seq
-sRn |PerlIO *|check_type_and_open|NN const char *name|NN const char *mode
+sR |PerlIO *|check_type_and_open|NN const char *name|NN const char *mode
sR |PerlIO *|doopen_pm |NN const char *name|NN const char *mode
sRn |bool |path_is_absolute|NN const char *name
sR |I32 |run_user_filter|int idx|NN SV *buf_sv|int maxlen
diff --git a/embed.h b/embed.h
index 8460885571..8476916a85 100644
--- a/embed.h
+++ b/embed.h
@@ -3400,7 +3400,7 @@
#define dopoptowhen(a) S_dopoptowhen(aTHX_ a)
#define save_lines(a,b) S_save_lines(aTHX_ a,b)
#define doeval(a,b,c,d) S_doeval(aTHX_ a,b,c,d)
-#define check_type_and_open S_check_type_and_open
+#define check_type_and_open(a,b) S_check_type_and_open(aTHX_ a,b)
#define doopen_pm(a,b) S_doopen_pm(aTHX_ a,b)
#define path_is_absolute S_path_is_absolute
#define run_user_filter(a,b,c) S_run_user_filter(aTHX_ a,b,c)
diff --git a/pp_ctl.c b/pp_ctl.c
index f88d401b6a..8ade9c3fb8 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3026,7 +3026,7 @@ S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq)
}
STATIC PerlIO *
-S_check_type_and_open(const char *name, const char *mode)
+S_check_type_and_open(pTHX_ const char *name, const char *mode)
{
Stat_t st;
const int st_rc = PerlLIO_stat(name, &st);
diff --git a/proto.h b/proto.h
index a6e5c2fdb8..bd5d285edf 100644
--- a/proto.h
+++ b/proto.h
@@ -3379,10 +3379,10 @@ STATIC void S_save_lines(pTHX_ AV *array, SV *sv)
STATIC OP* S_doeval(pTHX_ int gimme, OP** startop, CV* outside, U32 seq)
__attribute__warn_unused_result__;
-STATIC PerlIO * S_check_type_and_open(const char *name, const char *mode)
+STATIC PerlIO * S_check_type_and_open(pTHX_ const char *name, const char *mode)
__attribute__warn_unused_result__
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
+ __attribute__nonnull__(pTHX_1)
+ __attribute__nonnull__(pTHX_2);
STATIC PerlIO * S_doopen_pm(pTHX_ const char *name, const char *mode)
__attribute__warn_unused_result__