Mercurial > vim
changeset 4272:902d6ab377ee v7.3.886
updated for version 7.3.886
Problem: Can't build with multi-byte on Solaris 10.
Solution: Add #ifdef X_HAVE_UTF8_STRING. (Laurent Blume)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 12 Apr 2013 12:27:30 +0200 |
| parents | 317fd10cf5f0 |
| children | 73bdb401d109 |
| files | src/ui.c src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui.c +++ b/src/ui.c @@ -1458,7 +1458,7 @@ clip_gen_request_selection(cbd) int clip_gen_owner_exists(cbd) - VimClipboard *cbd; + VimClipboard *cbd UNUSED; { #ifdef FEAT_XCLIPBOARD # ifdef FEAT_GUI_GTK @@ -2134,7 +2134,7 @@ clip_x11_request_selection_cb(w, success text_prop.encoding = *type; text_prop.format = *format; text_prop.nitems = len; -#ifdef FEAT_MBYTE +#if defined(FEAT_MBYTE) && defined(X_HAVE_UTF8_STRING) if (*type == utf8_atom) status = Xutf8TextPropertyToTextList(X_DISPLAY, &text_prop, &text_list, &n_text); @@ -2196,8 +2196,13 @@ clip_x11_request_selection(myShell, dpy, default: type = XA_STRING; } #ifdef FEAT_MBYTE - if (type == utf8_atom && !enc_utf8) - /* Only request utf-8 when 'encoding' is utf8. */ + if (type == utf8_atom +# if defined(X_HAVE_UTF8_STRING) + && !enc_utf8 +# endif + ) + /* Only request utf-8 when 'encoding' is utf8 and + * Xutf8TextPropertyToTextList is available. */ continue; #endif success = MAYBE;