X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ccfc67b7b0a9fa9e1a1cbb2090b71ea33fc44ae7..447218f8e55820af4787908b91600ccbddafa327:/gv.h

diff --git a/gv.h b/gv.h
index 6dd206c..56cf72d 100644
--- a/gv.h
+++ b/gv.h
@@ -1,6 +1,7 @@
 /*    gv.h
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -22,10 +23,6 @@ struct gp {
     char *	gp_file;	/* file first declared in (for -w) */
 };
 
-#if defined(CRIPPLED_CC) && (defined(iAPX286) || defined(M_I286) || defined(I80286))
-#define MICROPORT
-#endif
-
 #define GvXPVGV(gv)	((XPVGV*)SvANY(gv))
 
 #define GvGP(gv)	(GvXPVGV(gv)->xgv_gp)
@@ -46,7 +43,7 @@ Return the SV from the GV.
 
 #define GvSV(gv)	(GvGP(gv)->gp_sv)
 #define GvREFCNT(gv)	(GvGP(gv)->gp_refcnt)
-#define GvIO(gv)	((gv) && SvTYPE((SV*)gv) == SVt_PVGV ? GvIOp(gv) : 0)
+#define GvIO(gv)	((gv) && SvTYPE((SV*)gv) == SVt_PVGV && GvGP(gv) ? GvIOp(gv) : 0)
 #define GvIOp(gv)	(GvGP(gv)->gp_io)
 #define GvIOn(gv)	(GvIO(gv) ? GvIOp(gv) : GvIOp(gv_IOadd(gv)))
 
@@ -56,22 +53,14 @@ Return the SV from the GV.
 /* This macro is deprecated.  Do not use! */
 #define GvREFCNT_inc(gv) ((GV*)SvREFCNT_inc(gv))	/* DO NOT USE */
 
-#ifdef	MICROPORT	/* Microport 2.4 hack */
-AV *GvAVn();
-#else
 #define GvAVn(gv)	(GvGP(gv)->gp_av ? \
 			 GvGP(gv)->gp_av : \
 			 GvGP(gv_AVadd(gv))->gp_av)
-#endif
 #define GvHV(gv)	((GvGP(gv))->gp_hv)
 
-#ifdef	MICROPORT	/* Microport 2.4 hack */
-HV *GvHVn();
-#else
 #define GvHVn(gv)	(GvGP(gv)->gp_hv ? \
 			 GvGP(gv)->gp_hv : \
 			 GvGP(gv_HVadd(gv))->gp_hv)
-#endif			/* Microport 2.4 hack */
 
 #define GvCV(gv)	(GvGP(gv)->gp_cv)
 #define GvCVGEN(gv)	(GvGP(gv)->gp_cvgen)