From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Thu, 29 Mar 2001 14:23:31 +0000 (+0000)
Subject: Win32 has name conflict with ERROR
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c7997937a3d3c62c11d46b84cf8e39979d05cd2e;p=p5sagit%2Fp5-mst-13.2.git

Win32 has name conflict with ERROR

p4raw-id: //depot/perlio@9435
---

diff --git a/ext/PerlIO/Via/Via.xs b/ext/PerlIO/Via/Via.xs
index 3f491da..0abcece 100644
--- a/ext/PerlIO/Via/Via.xs
+++ b/ext/PerlIO/Via/Via.xs
@@ -33,7 +33,7 @@ typedef struct
  CV *FLUSH;
  CV *SETLINEBUF;
  CV *CLEARERR;
- CV *ERROR;
+ CV *mERROR;
  CV *mEOF;
 } PerlIOVia;
 
@@ -459,21 +459,21 @@ PerlIOVia_clearerr(PerlIO *f)
  PerlIOBase_clearerr(f);
 }
 
-IV
-PerlIOVia_error(PerlIO *f)
+SV *
+PerlIOVia_getarg(PerlIO *f)
 {
  dTHX;
  PerlIOVia *s = PerlIOSelf(f,PerlIOVia);
- SV *result = PerlIOVia_method(aTHX_ f,MYMethod(ERROR),G_SCALAR,Nullsv);
- return (result) ? SvIV(result) : PerlIOBase_error(f);
+ return PerlIOVia_method(aTHX_ f,MYMethod(GETARG),G_SCALAR,Nullsv);
 }
 
-SV *
-PerlIOVia_getarg(PerlIO *f)
+IV
+PerlIOVia_error(PerlIO *f)
 {
  dTHX;
  PerlIOVia *s = PerlIOSelf(f,PerlIOVia);
- return PerlIOVia_method(aTHX_ f,MYMethod(GETARG),G_SCALAR,Nullsv);
+ SV *result = PerlIOVia_method(aTHX_ f,"ERROR",&s->mERROR,G_SCALAR,Nullsv);
+ return (result) ? SvIV(result) : PerlIOBase_error(f);
 }
 
 IV