From 1b4bfd90a51a285b48ec0dfc72bc5f9e24db010e Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 23 Oct 2014 15:02:08 +0100
Subject: [PATCH] GRIB-615: Compiler warnings with jasper: macros redefined

---
 tools/grib_tools.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/grib_tools.c b/tools/grib_tools.c
index 8a40add3a..c8503b779 100644
--- a/tools/grib_tools.c
+++ b/tools/grib_tools.c
@@ -15,6 +15,12 @@
 
 #include "grib_tools.h"
 #if HAVE_LIBJASPER
+/* Remove compiler warnings re macros being redefined */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include "jasper/jasper.h"
 #endif