cvs commit: ponie/perl sv.h

cvsuser     05/05/01 08:46:30

  Modified:    perl     sv.h
  Log:
  Oops. Change 1.61 (merging in 5.9.2) accidentally got the wrong hunk of sv.h,
  resulting in a lot of the macro functions going out of the window.
  
  Revision  Changes    Path
  1.77      +28 -28    ponie/perl/sv.h
  
  Index: sv.h
  ===================================================================
  RCS file: /cvs/public/ponie/perl/sv.h,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- sv.h	1 May 2005 15:12:20 -0000	1.76
  +++ sv.h	1 May 2005 15:46:30 -0000	1.77
  @@ -979,34 +979,34 @@
   		   SvPV_renew(sv, _lEnGtH); \
   		 } STMT_END
   
  -#define BmRARE(sv)	((XPVBM*)  SvANY(sv))->xbm_rare
  -#define BmUSEFUL(sv)	((XPVBM*)  SvANY(sv))->xbm_useful
  -#define BmPREVIOUS(sv)	((XPVBM*)  SvANY(sv))->xbm_previous
  -
  -#define FmLINES(sv)	((XPVFM*)  SvANY(sv))->xfm_lines
  -
  -#define LvTYPE(sv)	((XPVLV*)  SvANY(sv))->xlv_type
  -#define LvTARG(sv)	((XPVLV*)  SvANY(sv))->xlv_targ
  -#define LvTARGOFF(sv)	((XPVLV*)  SvANY(sv))->xlv_targoff
  -#define LvTARGLEN(sv)	((XPVLV*)  SvANY(sv))->xlv_targlen
  -
  -#define IoIFP(sv)	((XPVIO*)  SvANY(sv))->xio_ifp
  -#define IoOFP(sv)	((XPVIO*)  SvANY(sv))->xio_ofp
  -#define IoDIRP(sv)	((XPVIO*)  SvANY(sv))->xio_dirp
  -#define IoANY(sv)	((XPVIO*)  SvANY(sv))->xio_any
  -#define IoLINES(sv)	((XPVIO*)  SvANY(sv))->xio_lines
  -#define IoPAGE(sv)	((XPVIO*)  SvANY(sv))->xio_page
  -#define IoPAGE_LEN(sv)	((XPVIO*)  SvANY(sv))->xio_page_len
  -#define IoLINES_LEFT(sv)((XPVIO*)  SvANY(sv))->xio_lines_left
  -#define IoTOP_NAME(sv)	((XPVIO*)  SvANY(sv))->xio_top_name
  -#define IoTOP_GV(sv)	((XPVIO*)  SvANY(sv))->xio_top_gv
  -#define IoFMT_NAME(sv)	((XPVIO*)  SvANY(sv))->xio_fmt_name
  -#define IoFMT_GV(sv)	((XPVIO*)  SvANY(sv))->xio_fmt_gv
  -#define IoBOTTOM_NAME(sv)((XPVIO*) SvANY(sv))->xio_bottom_name
  -#define IoBOTTOM_GV(sv)	((XPVIO*)  SvANY(sv))->xio_bottom_gv
  -#define IoSUBPROCESS(sv)((XPVIO*)  SvANY(sv))->xio_subprocess
  -#define IoTYPE(sv)	((XPVIO*)  SvANY(sv))->xio_type
  -#define IoFLAGS(sv)	((XPVIO*)  SvANY(sv))->xio_flags
  +#define BmRARE(sv)	(* Perl_macro_BmRARE(aTHX_ (SV*)(sv)))
  +#define BmUSEFUL(sv)	(* Perl_macro_BmUSEFUL(aTHX_ (SV*)(sv)))
  +#define BmPREVIOUS(sv)	(* Perl_macro_BmPREVIOUS(aTHX_ (SV*)(sv)))
  +
  +#define FmLINES(sv)	(* Perl_macro_BmPREVIOUS(aTHX_ (SV*)(sv)))
  +
  +#define LvTYPE(sv)      ( * Perl_macro_LvTYPE(aTHX_ (SV*)(sv)))
  +#define LvTARG(sv)      ( * Perl_macro_LvTARG(aTHX_ (SV*)(sv)))
  +#define LvTARGOFF(sv)   ( * Perl_macro_LvTARGOFF(aTHX_ (SV*)(sv)))
  +#define LvTARGLEN(sv)   ( * Perl_macro_LvTARGLEN(aTHX_ (SV*)(sv)))
  +
  +#define IoIFP(sv)	( * Perl_macro_IoIFP(aTHX_ (SV*)(sv)))
  +#define IoOFP(sv)	( * Perl_macro_IoOFP(aTHX_ (SV*)(sv)))
  +#define IoDIRP(sv)	( * Perl_macro_IoDIRP(aTHX_ (SV*)(sv)))
  +#define IoANY(sv)	( * Perl_macro_IoANY(aTHX_ (SV*)(sv)))
  +#define IoLINES(sv)	( * Perl_macro_IoLINES(aTHX_ (SV*)(sv)))
  +#define IoPAGE(sv)	( * Perl_macro_IoPAGE(aTHX_ (SV*)(sv)))
  +#define IoPAGE_LEN(sv)	( * Perl_macro_IoPAGE_LEN(aTHX_ (SV*)(sv)))
  +#define IoLINES_LEFT(sv)( * Perl_macro_IoLINES_LEFT(aTHX_ (SV*)(sv)))
  +#define IoTOP_NAME(sv)	( * Perl_macro_IoTOP_NAME(aTHX_ (SV*)(sv)))
  +#define IoTOP_GV(sv)	( * Perl_macro_IoTOP_GV(aTHX_ (SV*)(sv)))
  +#define IoFMT_NAME(sv)	( * Perl_macro_IoFMT_NAME(aTHX_ (SV*)(sv)))
  +#define IoFMT_GV(sv)	( * Perl_macro_IoFMT_GV(aTHX_ (SV*)(sv)))
  +#define IoBOTTOM_NAME(sv)( * Perl_macro_IoBOTTOM_NAME(aTHX_ (SV*)(sv)))
  +#define IoBOTTOM_GV(sv)	( * Perl_macro_IoBOTTOM_GV(aTHX_ (SV*)(sv)))
  +#define IoSUBPROCESS(sv)( * Perl_macro_IoSUBPROCESS(aTHX_ (SV*)(sv)))
  +#define IoTYPE(sv)	( * Perl_macro_IoTYPE(aTHX_ (SV*)(sv)))
  +#define IoFLAGS(sv)	( * Perl_macro_IoFLAGS(aTHX_ (SV*)(sv)))
   
   /* IoTYPE(sv) is a single character telling the type of I/O connection. */
   #define IoTYPE_RDONLY		'<'