From ea254104154f58affdedbb6b641235e8c66a3049 Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss@ulticom.com>
Date: Tue, 20 Apr 2010 00:18:51 +0000
Subject: From Peter Harris via
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :

The XKEYBOARD extension is a pain in the... so XCB had to grow new ways to
describe the protocol.

This patch adds support to the Wireshark dissector, so it can successfully
process the XCB description of the XKEYBOARD extension.

Without this patch, "make x11-dissector" chokes on the current xcbproto from
git.

Also update the script to deal with the new mesa directory structure.

svn path=/trunk/; revision=32520
---
 epan/dissectors/x11-extension-errors.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'epan/dissectors/x11-extension-errors.h')

diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 5cfdf81ad5..8685cfd6ea 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.5-5-g4f4d43e */
+   using xcbproto version 1.6-4-g2d873a3 */
 /* $Id$ */
 
 /*
@@ -42,6 +42,10 @@ const char *dpms_errors[] = {
   NULL
 };
 
+const char *dri2_errors[] = {
+  NULL
+};
+
 const char *ge_errors[] = {
   NULL
 };
@@ -148,6 +152,11 @@ const char *xinput_errors[] = {
   NULL
 };
 
+const char *xkb_errors[] = {
+  "xkb-Keyboard",
+  NULL
+};
+
 const char *xprint_errors[] = {
   "xprint-BadContext",
   "xprint-BadSequence",
-- 
cgit v1.2.3