Use a gcc pragma to stop the (pages of) warnings coming out of

x11-extensions-implementation.h .

This change was manually applied to the .h file as I can't currently rebuild
the X11 dissector.

svn path=/trunk/; revision=53298

2 files changed, 5 insertions, 2 deletions

diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index a37a025bef..2a70eafd93 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -25,6 +25,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+
 #include "x11-glx-render-enum.h"
 
 static void mesa_CallList(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index d29a6f1aad..6a648fc8cf 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -125,7 +125,7 @@ my %struct =  # Not reset; contains structures already defined.
 
     # structures defined by xv, but never used (bug in xcb?)
     Image => 1,
-    
+
     # structures defined by xkb, but never used (bug in xcb?)
     CountedString8 => 1,
 );
@@ -494,7 +494,7 @@ sub register_element($$$;$)
     my $ft = $info->{'type'} // 'FT_NONE';
     my $base = $info->{'base'} // 'BASE_NONE';
     my $vals = 'NULL';
-    
+
     my $enum = $e->att('enum') // $e->att('altenum');
     if (defined $enum) {
 	my $enumname = dump_enum_values($enum_name{$enum});
@@ -1383,6 +1383,7 @@ if (-e "$mesadir/gl_API.xml") {
 	    or die ("Cannot open x11-glx-render-enum.h for writing\n");
     add_generated_header($enum, 'mesa');
     print $enum "static const value_string mesa_enum[] = {\n";
+    print $impl '#pragma GCC diagnostic ignored "-Wunused-but-set-variable"'."\n\n";
     print $impl '#include "x11-glx-render-enum.h"'."\n\n";
 
     print("Mesa glRender:\n");