diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /apps | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/xwininfo/xwininfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/xwininfo/xwininfo.c b/apps/xwininfo/xwininfo.c index de1e33e4c..59e09aff8 100644 --- a/apps/xwininfo/xwininfo.c +++ b/apps/xwininfo/xwininfo.c @@ -1837,7 +1837,7 @@ get_net_wm_name (xcb_connection_t *gnwn_dpy, xcb_window_t win) #define UTF8_SHORT_TAIL 3 #define UTF8_LONG_TAIL 4 static int -is_valid_utf8 (const char *string, int len) +is_valid_utf8 (const char *string, size_t len) { unsigned long codepoint; int rem, i; @@ -1958,7 +1958,7 @@ get_friendly_name (const char *string, const char *prefix) const char *name_start = string; char *lowered_name, *n; Bool first = True; - int prefix_len = strlen (prefix); + size_t prefix_len = strlen (prefix); if (strncmp (name_start, prefix, prefix_len) == 0) { name_start += prefix_len; |