Merge branch 'for-whot' of git://people.freedesktop.org/~alanc/xserver into for-keith

This commit is contained in:
Peter Hutterer
2011-12-13 14:19:54 +10:00
4 changed files with 29 additions and 12 deletions

View File

@@ -626,7 +626,7 @@ void verify_internal_event(const InternalEvent *ev)
if (ev && ev->any.header != ET_Internal)
{
int i;
unsigned char *data = (unsigned char*)ev;
const unsigned char *data = (const unsigned char*)ev;
ErrorF("dix: invalid event type %d\n", ev->any.header);