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 /dix | |
| 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 'dix')
| -rw-r--r-- | dix/cursor.c | 2 | ||||
| -rw-r--r-- | dix/dispatch.c | 5 | ||||
| -rw-r--r-- | dix/dixutils.c | 4 | ||||
| -rw-r--r-- | dix/registry.c | 5 | ||||
| -rw-r--r-- | dix/resource.c | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index f29cb1125..6bff44723 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -152,7 +152,7 @@ CheckForEmptyMask(CursorBitsPtr bits) if (bits->argb) { CARD32 *argb = bits->argb; - int n = bits->width * bits->height; + n = bits->width * bits->height; while (n--) if (*argb++ & 0xff000000) return; } diff --git a/dix/dispatch.c b/dix/dispatch.c index b39271fd9..048dff652 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3600,7 +3600,7 @@ ProcInitialConnection(ClientPtr client) } static int -SendConnSetup(ClientPtr client, char *reason) +SendConnSetup(ClientPtr client, const char *reason) { xWindowRoot *root; int i; @@ -3699,7 +3699,8 @@ SendConnSetup(ClientPtr client, char *reason) int ProcEstablishConnection(ClientPtr client) { - char *reason, *auth_proto, *auth_string; + const char *reason; + char *auth_proto, *auth_string; xConnClientPrefix *prefix; REQUEST(xReq); diff --git a/dix/dixutils.c b/dix/dixutils.c index 1e3134663..00bbde67c 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -167,8 +167,8 @@ ISOLatin1ToLower (unsigned char source) int -CompareISOLatin1Lowered(unsigned char *s1, int s1len, - unsigned char *s2, int s2len) +CompareISOLatin1Lowered(const unsigned char *s1, int s1len, + const unsigned char *s2, int s2len) { unsigned char c1, c2; diff --git a/dix/registry.c b/dix/registry.c index fc35dbbc7..5ab25ad70 100644 --- a/dix/registry.c +++ b/dix/registry.c @@ -41,7 +41,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static FILE *fh; -static char ***requests, **events, **errors, **resources; +static char ***requests, **events, **errors; +static const char **resources; static unsigned nmajor, *nminor, nevent, nerror, nresource; /* @@ -197,7 +198,7 @@ RegisterExtensionNames(ExtensionEntry *extEntry) */ void -RegisterResourceName(RESTYPE resource, char *name) +RegisterResourceName(RESTYPE resource, const char *name) { resource &= TypeMask; diff --git a/dix/resource.c b/dix/resource.c index eb9f0492a..be8a8f81b 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -242,7 +242,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res) } RESTYPE -CreateNewResourceType(DeleteType deleteFunc, char *name) +CreateNewResourceType(DeleteType deleteFunc, const char *name) { RESTYPE next = lastResourceType + 1; struct ResourceType *types; |