summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E Keenan <jkeenan@cpan.org>2021-07-15 11:50:12 +0000
committerJames E Keenan <jkeenan@cpan.org>2021-07-15 11:50:12 +0000
commit415da10787d8fa5176e711559172aa0604ec3d0d (patch)
tree36fbc3a0beb384f5eb77a533bedfb5e8b4c6ab92
parent7ffb9e762a2e972f46cd37962bd0aae40a4e7e3b (diff)
parent7169efc77525df70484a824bff4ceebd1fafc760 (diff)
downloadperl-415da10787d8fa5176e711559172aa0604ec3d0d.tar.gz
Merge branch '18780-compound-token-split-by-macro' into blead
-rw-r--r--dist/Devel-PPPort/parts/inc/misc9
-rw-r--r--perl.h5
2 files changed, 2 insertions, 12 deletions
diff --git a/dist/Devel-PPPort/parts/inc/misc b/dist/Devel-PPPort/parts/inc/misc
index 9ec0a04df2..e62f3a7c64 100644
--- a/dist/Devel-PPPort/parts/inc/misc
+++ b/dist/Devel-PPPort/parts/inc/misc
@@ -248,17 +248,12 @@ __UNDEF_NOT_PROVIDED__ PERL_GCC_BRACE_GROUPS_FORBIDDEN
#undef STMT_START
#undef STMT_END
-#ifdef PERL_USE_GCC_BRACE_GROUPS
-# define STMT_START (void)( /* gcc supports ``({ STATEMENTS; })'' */
-# define STMT_END )
-#else
-# if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
+#if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
# define STMT_START if (1)
# define STMT_END else (void)0
-# else
+#else
# define STMT_START do
# define STMT_END while (0)
-# endif
#endif
__UNDEFINED__ boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
diff --git a/perl.h b/perl.h
index 6c3cb6d669..917ed5fcbb 100644
--- a/perl.h
+++ b/perl.h
@@ -734,13 +734,8 @@ Example usage:
Trying to select a version that gives no warnings...
*/
#if !(defined(STMT_START) && defined(STMT_END))
-# ifdef PERL_USE_GCC_BRACE_GROUPS
-# define STMT_START (void)( /* gcc supports "({ STATEMENTS; })" */
-# define STMT_END )
-# else
# define STMT_START do
# define STMT_END while (0)
-# endif
#endif
#ifndef BYTEORDER /* Should never happen -- byteorder is in config.h */