X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/9b1663a5574182a66c6de8ad2fce7b3e4cbf277b..23bbea75793621e6b21fbb13c00d8223113cf7b5:/math/mpx.c

diff --git a/math/mpx.c b/math/mpx.c
index 37a8a4e..5a9a176 100644
--- a/math/mpx.c
+++ b/math/mpx.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include <mLib/bits.h>
+#include <mLib/macros.h>
 
 #include "mptypes.h"
 #include "mpx.h"
@@ -661,12 +662,6 @@ done:;
  * Use;		Provides the dyadic boolean functions.
  */
 
-/* GCC complains about the generated code, so try to silence it. */
-#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-
 #define MPX_BITBINOP(string)						\
 									\
 void mpx_bit##string(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl,	\
@@ -680,15 +675,12 @@ void mpx_bit##string(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl,	\
     a = (av < avl) ? *av++ : 0;						\
     b = (bv < bvl) ? *bv++ : 0;						\
     *dv++ = B##string(a, b);						\
+    IGNORE(a); IGNORE(b);						\
   }									\
 }
 
 MPX_DOBIN(MPX_BITBINOP)
 
-#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#  pragma GCC diagnostic pop
-#endif
-
 void mpx_not(mpw *dv, mpw *dvl, const mpw *av, const mpw *avl)
 {
   MPX_SHRINK(av, avl);