diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-13 00:07:34 +0000 |
| commit | 9c3bbf44c14a9d2822704c1114b07a2ce8cf4110 (patch) | |
| tree | fcde4a2027137e06644d97b9f235660578ffe155 /epan/dissectors/x11-extension-errors.h | |
| parent | 20a52095aaf4d007d123547190927048849aaf82 (diff) | |
From Peter Harris:
An enum name collision was recently added to the upstream XCB/proto.
Avoid the collision by putting enum names into their proper namespace.
After applying that, regenerate the X11 dissector.
svn path=/trunk/; revision=41514
Diffstat (limited to 'epan/dissectors/x11-extension-errors.h')
| -rw-r--r-- | epan/dissectors/x11-extension-errors.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h index 6fd05e5ecb..b4e8a0d04a 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.6-26-gfb2af7c */ + using xcbproto version 1.7-3-g12cb81c */ /* $Id$ */ /* @@ -64,6 +64,7 @@ const char *glx_errors[] = { "glx-BadPbuffer", "glx-BadCurrentDrawable", "glx-BadWindow", + "glx-GLXBadProfileARB", NULL }; |