Change 20605 by [EMAIL PROTECTED] on 2003/08/10 20:38:39
gcc -ansi -pedantic cleanup; and a seemingly forgotten
sv_placeholder hunk.
Affected files ...
... //depot/perl/perl.h#532 edit
... //depot/perl/sv.h#144 edit
Differences ...
==== //depot/perl/perl.h#532 (text) ====
Index: perl/perl.h
--- perl/perl.h#531~20475~ Mon Aug 4 02:35:55 2003
+++ perl/perl.h Sun Aug 10 13:38:39 2003
@@ -207,6 +207,10 @@
# endif
#endif
+#if defined(__STRICT_ANSI__) && defined(PERL_GCC_PEDANTIC)
+# define PERL_GCC_BRACE_GROUPS_FORBIDDEN
+#endif
+
/*
* STMT_START { statements; } STMT_END;
* can be used as a single statement, as in
@@ -215,7 +219,7 @@
* Trying to select a version that gives no warnings...
*/
#if !(defined(STMT_START) && defined(STMT_END))
-# if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC) &&
!defined(__cplusplus)
+# if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) &&
!defined(__cplusplus)
# define STMT_START (void)( /* gcc supports ``({ STATEMENTS; })'' */
# define STMT_END )
# else
==== //depot/perl/sv.h#144 (text) ====
Index: perl/sv.h
--- perl/sv.h#143~19268~ Sat Apr 19 00:06:13 2003
+++ perl/sv.h Sun Aug 10 13:38:39 2003
@@ -528,7 +528,7 @@
#define SvNIOK_off(sv) (SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK| \
SVp_IOK|SVp_NOK|SVf_IVisUV))
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
#define assert_not_ROK(sv) ({assert(!SvROK(sv) || !SvRV(sv))}),
#else
#define assert_not_ROK(sv)
@@ -1001,7 +1001,7 @@
#define SvPVutf8x_force(sv, lp) sv_pvutf8n_force(sv, &lp)
#define SvPVbytex_force(sv, lp) sv_pvbyten_force(sv, &lp)
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC)
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
# define SvIVx(sv) ({SV *nsv = (SV*)(sv); SvIV(nsv); })
# define SvUVx(sv) ({SV *nsv = (SV*)(sv); SvUV(nsv); })
@@ -1227,7 +1227,7 @@
#define SvPEEK(sv) ""
#endif
-#define SvIMMORTAL(sv) ((sv)==&PL_sv_undef || (sv)==&PL_sv_yes || (sv)==&PL_sv_no)
+#define SvIMMORTAL(sv) ((sv)==&PL_sv_undef || (sv)==&PL_sv_yes || (sv)==&PL_sv_no ||
(sv)==&PL_sv_placeholder)
#define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
End of Patch.
