Skip to content

Commit d7d7299

Browse files
committed
Convert _XPVCV_HEAD to legal name
1 parent 460234e commit d7d7299

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

cv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/* This structure must match the beginning of XPVFM in sv.h */
1212

1313
struct xpvcv {
14-
_XPV_HEAD;
14+
XPV_HEAD_;
1515
XPVCV_COMMON_;
1616
};
1717

perl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4551,7 +4551,7 @@ struct Perl_OpDumpContext;
45514551
#define my_lstat() my_lstat_flags(SV_GMAGIC)
45524552

45534553
/* defined in sv.c, but also used in [ach]v.c */
4554-
#undef _XPV_HEAD
4554+
#undef XPV_HEAD_
45554555
#undef _XPVMG_HEAD
45564556
#undef XPVCV_COMMON_
45574557

pod/perlreapi.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ values.
643643
/*----------------------------------------------------------------------
644644
* Fields required for compatibility with SV types
645645
*/
646-
_XPV_HEAD;
646+
XPV_HEAD_;
647647

648648
/*----------------------------------------------------------------------
649649
* Operational fields

regexp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef struct regexp {
139139
/*----------------------------------------------------------------------
140140
* Fields required for compatibility with SV types
141141
*/
142-
_XPV_HEAD;
142+
XPV_HEAD_;
143143

144144
/*----------------------------------------------------------------------
145145
* Operational fields

sv.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ These guys don't need the curly blocks
538538
#define SVprv_WEAKREF 0x80000000 /* Weak reference */
539539
/* pad name vars only */
540540

541-
#define _XPV_HEAD \
541+
#define XPV_HEAD_ \
542542
HV* xmg_stash; /* class package */ \
543543
union xmgu_ xmg_u; \
544544
STRLEN xpv_cur; /* length of svu_pv as a C string */ \
@@ -570,38 +570,38 @@ union xmgu_ {
570570
};
571571

572572
struct xpv {
573-
_XPV_HEAD;
573+
XPV_HEAD_;
574574
};
575575

576576
struct xpviv {
577-
_XPV_HEAD;
577+
XPV_HEAD_;
578578
union xivu_ xiv_u;
579579
};
580580

581581
#define xiv_iv xiv_u.xivu_iv
582582

583583
struct xpvuv {
584-
_XPV_HEAD;
584+
XPV_HEAD_;
585585
union xivu_ xuv_u;
586586
};
587587

588588
#define xuv_uv xuv_u.xivu_uv
589589

590590
struct xpvnv {
591-
_XPV_HEAD;
591+
XPV_HEAD_;
592592
union xivu_ xiv_u;
593593
union xnvu_ xnv_u;
594594
};
595595

596596
/* This structure must match the beginning of struct xpvhv in hv.h. */
597597
struct xpvmg {
598-
_XPV_HEAD;
598+
XPV_HEAD_;
599599
union xivu_ xiv_u;
600600
union xnvu_ xnv_u;
601601
};
602602

603603
struct xpvlv {
604-
_XPV_HEAD;
604+
XPV_HEAD_;
605605
union xivu_ xiv_u;
606606
union xnvu_ xnv_u;
607607
union {
@@ -619,7 +619,7 @@ struct xpvlv {
619619
#define xlv_targoff xlv_targoff_u.xlvu_targoff
620620

621621
struct xpvinvlist {
622-
_XPV_HEAD;
622+
XPV_HEAD_;
623623
IV prev_index; /* caches result of previous invlist_search() */
624624
STRLEN iterator; /* Stores where we are in iterating */
625625
bool is_offset; /* The data structure for all inversion lists
@@ -633,7 +633,7 @@ struct xpvinvlist {
633633
/* This structure works in 2 ways - regular scalar, or GV with GP */
634634

635635
struct xpvgv {
636-
_XPV_HEAD;
636+
XPV_HEAD_;
637637
union xivu_ xiv_u;
638638
union xnvu_ xnv_u;
639639
};
@@ -669,13 +669,13 @@ typedef U32 cv_flags_t;
669669
/* This structure must match XPVCV in cv.h */
670670

671671
struct xpvfm {
672-
_XPV_HEAD;
672+
XPV_HEAD_;
673673
XPVCV_COMMON_;
674674
};
675675

676676

677677
struct xpvio {
678-
_XPV_HEAD;
678+
XPV_HEAD_;
679679
union xivu_ xiv_u;
680680
/* ifp and ofp are normally the same, but sockets need separate streams */
681681
PerlIO * xio_ofp;

0 commit comments

Comments
 (0)