From: Douglas Lankshear <doug@lankshear.net>
Date: Thu, 5 Mar 1998 10:23:04 +0000 (-0800)
Subject: [asperl] added AS patch#11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fe9f1ed50ae7ad31787549184f98f0a71eda0191;p=p5sagit%2Fp5-mst-13.2.git

[asperl] added AS patch#11
	Message-Id: <01BD4820.AFC70110.dougl@ActiveState.com>

	This patch fixes a bug I introduced removing duplicate code.
	 -- Doug

p4raw-id: //depot/asperl@788
---

diff --git a/ObjXSub.h b/ObjXSub.h
index 9fcf772..46c52d5 100644
--- a/ObjXSub.h
+++ b/ObjXSub.h
@@ -1207,8 +1207,6 @@
 #define newRV_noinc           pPerl->Perl_newRV_noinc
 #undef  newSV
 #define newSV                 pPerl->Perl_newSV
-#undef  newSV
-#define newSV                 pPerl->Perl_newSV
 #undef  newSVREF
 #define newSVREF              pPerl->Perl_newSVREF
 #undef  newSVOP
@@ -1219,6 +1217,10 @@
 #define newSVnv               pPerl->Perl_newSVnv
 #undef  newSVpv
 #define newSVpv               pPerl->Perl_newSVpv
+#undef  newSVpvf
+#define newSVpvf              pPerl->Perl_newSVpvf
+#undef  newSVpvn
+#define newSVpvn              pPerl->Perl_newSVpvn
 #undef  newSVrv
 #define newSVrv               pPerl->Perl_newSVrv
 #undef  newSVsv
diff --git a/objpp.h b/objpp.h
index 9e701ff..61f7f19 100644
--- a/objpp.h
+++ b/objpp.h
@@ -787,8 +787,6 @@
 #define Perl_newRV_noinc  CPerlObj::Perl_newRV_noinc
 #undef  newSV
 #define newSV             CPerlObj::Perl_newSV
-#undef  newSV
-#define newSV             CPerlObj::Perl_newSV
 #undef  newSVREF
 #define newSVREF          CPerlObj::Perl_newSVREF
 #undef  newSVOP
@@ -799,14 +797,14 @@
 #define newSVnv           CPerlObj::Perl_newSVnv
 #undef  newSVpv
 #define newSVpv           CPerlObj::Perl_newSVpv
-#undef  newSVrv
-#define newSVrv           CPerlObj::Perl_newSVrv
-#undef  newSVsv
-#define newSVsv           CPerlObj::Perl_newSVsv
 #undef  newSVpvf
 #define newSVpvf          CPerlObj::Perl_newSVpvf
 #undef  newSVpvn
 #define newSVpvn          CPerlObj::Perl_newSVpvn
+#undef  newSVrv
+#define newSVrv           CPerlObj::Perl_newSVrv
+#undef  newSVsv
+#define newSVsv           CPerlObj::Perl_newSVsv
 #undef  newUNOP
 #define newUNOP           CPerlObj::Perl_newUNOP
 #undef  newWHILEOP
diff --git a/win32/runperl.c b/win32/runperl.c
index ec65e2c..cecdfeb 100644
--- a/win32/runperl.c
+++ b/win32/runperl.c
@@ -762,14 +762,14 @@ public:
     };
     virtual SSize_t Read(PerlIO* pf, void *buffer, Size_t size, int &err)
     {
-	SSize_t i = win32_fread(buffer, size, 1, (FILE*)pf);
+	SSize_t i = win32_fread(buffer, 1, size, (FILE*)pf);
 	if(errno)
 	    err = errno;
 	return i;
     };
     virtual SSize_t Write(PerlIO* pf, const void *buffer, Size_t size, int &err)
     {
-	SSize_t i = win32_fwrite(buffer, size, 1, (FILE*)pf);
+	SSize_t i = win32_fwrite(buffer, 1, size, (FILE*)pf);
 	if(errno)
 	    err = errno;
 	return i;