From 8e636ea6806ab5d1f1d05bafd0a192dad06d42b6 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Wed, 27 Mar 2013 17:36:28 -0400 Subject: Protect gcc diagnostic pragmas with gcc version Versions prior to 4.6 didn't allow gcc diagnostic pragmas with push and pop and to appear anywhere in the file. Just let the warning be there for those versions. --- libqpdf/Pl_Flate.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libqpdf/Pl_Flate.cc') diff --git a/libqpdf/Pl_Flate.cc b/libqpdf/Pl_Flate.cc index be8ca8ba..297cdac7 100644 --- a/libqpdf/Pl_Flate.cc +++ b/libqpdf/Pl_Flate.cc @@ -77,8 +77,10 @@ Pl_Flate::handleData(unsigned char* data, int len, int flush) // deflateInit and inflateInit are macros that use old-style // casts. #ifdef __GNUC__ +# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wold-style-cast" +# endif #endif if (this->action == a_deflate) { @@ -89,7 +91,9 @@ Pl_Flate::handleData(unsigned char* data, int len, int flush) err = inflateInit(&zstream); } #ifdef __GNUC__ +# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 # pragma GCC diagnostic pop +# endif #endif checkError("Init", err); -- cgit v1.2.3-54-g00ecf