summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2019-12-17 15:21:26 -0700
committerKarl Williamson <khw@cpan.org>2019-12-17 15:28:25 -0700
commitc55422bab220dd194925b14f223bc6272aa4d4cf (patch)
treee41fb2b591e9e6eb3512d6897db472d2a21de18f
parentdca9f615c2ca4c784ef9cdd9a7a313de40998bcf (diff)
downloadperl-c55422bab220dd194925b14f223bc6272aa4d4cf.tar.gz
PATCH GH #17276 New compilation diagnostic
The previous patch in commit 830b3eb245d5dbcf095fbd4b5d59764c697c20df didn't work generally. This uses #ifdef instead.
-rw-r--r--perl.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl.h b/perl.h
index 2ee27f4a3a..a7e72ffec9 100644
--- a/perl.h
+++ b/perl.h
@@ -7517,8 +7517,9 @@ START_EXTERN_C
*/
/* The quadmath literals are anon structs which -Wc++-compat doesn't like. */
-GCC_DIAG_IGNORE_DECL(-Wpragmas);
+# ifndef USE_CPLUSPLUS
GCC_DIAG_IGNORE_DECL(-Wc++-compat);
+# endif
# ifdef USE_QUADMATH
/* Cannot use HUGE_VALQ for PL_inf because not a compile-time
@@ -7588,8 +7589,9 @@ INFNAN_NV_U8_DECL PL_nan = { 0.0/0.0 }; /* keep last */
# endif
# endif
+# ifndef USE_CPLUSPLUS
GCC_DIAG_RESTORE_DECL;
-GCC_DIAG_RESTORE_DECL;
+# endif
#else