summaryrefslogtreecommitdiff
path: root/mg.c
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1998-03-07 07:51:28 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-03-07 07:51:28 +0000
commit3bd495df69b982704c59fc1ecbed71e5112e7da0 (patch)
tree47303adb4596ab4c7c0b981f50c0a72d52092338 /mg.c
parentfe9f1ed50ae7ad31787549184f98f0a71eda0191 (diff)
parent1d16519d77cbada019f865cb923236cd48a23c72 (diff)
downloadperl-3bd495df69b982704c59fc1ecbed71e5112e7da0.tar.gz
[win32] integrate mainline changes
p4raw-id: //depot/asperl@799
Diffstat (limited to 'mg.c')
-rw-r--r--mg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mg.c b/mg.c
index a487674025..29fe0a403a 100644
--- a/mg.c
+++ b/mg.c
@@ -977,8 +977,8 @@ magic_methcall(MAGIC *mg, char *meth, I32 flags, int n, SV *val)
{
dSP;
- PUSHMARK(sp);
- EXTEND(sp, n);
+ PUSHMARK(SP);
+ EXTEND(SP, n);
PUSHs(mg->mg_obj);
if (n > 1) {
if (mg->mg_ptr) {
@@ -1062,7 +1062,7 @@ int magic_wipepack(SV *sv, MAGIC *mg)
{
dSP;
- PUSHMARK(sp);
+ PUSHMARK(SP);
XPUSHs(mg->mg_obj);
PUTBACK;
ENTER;
@@ -1079,8 +1079,8 @@ magic_nextpack(SV *sv, MAGIC *mg, SV *key)
ENTER;
SAVETMPS;
- PUSHMARK(sp);
- EXTEND(sp, 2);
+ PUSHMARK(SP);
+ EXTEND(SP, 2);
PUSHs(mg->mg_obj);
if (SvOK(key))
PUSHs(key);
@@ -1565,7 +1565,7 @@ magic_set(SV *sv, MAGIC *mg)
STATUS_POSIX_SET(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv));
break;
case '!':
- SETERRNO(SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv),
+ SETERRNO(SvIOK(sv) ? SvIVX(sv) : SvOK(sv) ? sv_2iv(sv) : 0,
(SvIV(sv) == EVMSERR) ? 4 : vaxc$errno);
break;
case '<':
@@ -1892,7 +1892,7 @@ sighandler(int sig)
sv = sv_newmortal();
sv_setpv(sv,sig_name[sig]);
}
- PUSHMARK(sp);
+ PUSHMARK(SP);
PUSHs(sv);
PUTBACK;