diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-22 09:29:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-22 09:29:59 +1000 |
| commit | e395efc25f9fd60377f32c2bf1a9153d70908236 (patch) | |
| tree | 8f8a4fdd19f7ab2aba423f1279b29c336a3060eb /include/dix.h | |
| parent | 2bb282cd45cb8149b39d72397ef5bbcfebca11d2 (diff) | |
| parent | fcda98c48610fd507ca0b89c6006a5497d9dc1c9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch
Conflicts:
configure.ac
dix/inpututils.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include/dix.h')
| -rw-r--r-- | include/dix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dix.h b/include/dix.h index 4f21b4105..f3f68d39c 100644 --- a/include/dix.h +++ b/include/dix.h @@ -175,9 +175,9 @@ extern _X_HIDDEN Bool CreateConnectionBlock(void); /* dixutils.c */ extern _X_EXPORT int CompareISOLatin1Lowered( - unsigned char * /*a*/, + const unsigned char * /*a*/, int alen, - unsigned char * /*b*/, + const unsigned char * /*b*/, int blen); extern _X_EXPORT int dixLookupWindow( |