diff -ruN perl-5.18.4-orig/cpan/Devel-PPPort/parts/inc/misc perl-5.18.4/cpan/Devel-PPPort/parts/inc/misc
--- perl-5.18.4-orig/cpan/Devel-PPPort/parts/inc/misc	2014-09-30 20:32:59
+++ perl-5.18.4/cpan/Devel-PPPort/parts/inc/misc	2024-11-14 06:38:35
@@ -145,17 +145,12 @@
 
 #undef STMT_START
 #undef STMT_END
-#ifdef PERL_USE_GCC_BRACE_GROUPS
-#  define STMT_START	(void)(	/* gcc supports ``({ STATEMENTS; })'' */
-#  define STMT_END	)
+#if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
+#    define STMT_START  if (1)
+#    define STMT_END    else (void)0
 #else
-#  if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
-#    define STMT_START	if (1)
-#    define STMT_END	else (void)0
-#  else
-#    define STMT_START	do
-#    define STMT_END	while (0)
-#  endif
+#    define STMT_START  do
+#    define STMT_END    while (0)
 #endif
 
 __UNDEFINED__  boolSV(b)    ((b) ? &PL_sv_yes : &PL_sv_no)
diff -ruN perl-5.18.4-orig/perl.h perl-5.18.4/perl.h
--- perl-5.18.4-orig/perl.h	2014-09-30 20:33:00
+++ perl-5.18.4/perl.h	2024-11-14 06:45:41
@@ -473,19 +473,8 @@
  * 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
-   /* Now which other defined()s do we need here ??? */
-#  if (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
-#   define STMT_START	if (1)
-#   define STMT_END	else (void)0
-#  else
 #   define STMT_START	do
 #   define STMT_END	while (0)
-#  endif
-# endif
 #endif
 
 #ifndef BYTEORDER  /* Should never happen -- byteorder is in config.h */