Merge branch 'fixes/push-pop-mismatch'

* fixes/push-pop-mismatch:
  Fix push/pop mismatch
This commit is contained in:
William S Fulton 2022-11-29 08:09:14 +00:00
commit 95951cb4db
2 changed files with 6 additions and 0 deletions

View file

@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.2.0 (in progress) Version 4.2.0 (in progress)
=========================== ===========================
2022-11-29: bero
Fix mismatch between #pragma GCC diagnostic push and pop statements
2022-11-26: wsfulton 2022-11-26: wsfulton
#2449 Fix undefined behaviour in ccache-swig calculating md4 hashes and possibly #2449 Fix undefined behaviour in ccache-swig calculating md4 hashes and possibly
also handling errors when CCACHE_CPP2 is set. also handling errors when CCACHE_CPP2 is set.

View file

@ -7,6 +7,7 @@ extern "C" {
#if __GNUC__ >= 10 #if __GNUC__ >= 10
#if defined(__cplusplus) #if defined(__cplusplus)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wvolatile" #pragma GCC diagnostic ignored "-Wvolatile"
#endif #endif
#endif #endif
@ -16,8 +17,10 @@ extern "C" {
#include "XSUB.h" #include "XSUB.h"
#if __GNUC__ >= 10 #if __GNUC__ >= 10
#if defined(__cplusplus)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif
/* PERL_REVISION was added in Perl 5.6. */ /* PERL_REVISION was added in Perl 5.6. */
#if !defined PERL_REVISION || (PERL_REVISION-0 == 5 && PERL_VERSION-0 < 8) #if !defined PERL_REVISION || (PERL_REVISION-0 == 5 && PERL_VERSION-0 < 8)