diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
| commit | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (patch) | |
| tree | ad86feed38d780515cf9da608c5ea21eed04e17d /libX11 | |
| parent | 4f67039e9191d5251c39069bd791a05c5cf22022 (diff) | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.gz vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.bz2 vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXmu/src/CmapAlloc.c
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 2 | ||||
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 8 | ||||
| -rw-r--r-- | libX11/src/xlibi18n/lcFile.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 9a87453de..71662b857 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -220,7 +220,7 @@ AC_CHECK_HEADERS([sys/select.h]) # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. -AC_CHECK_FUNCS([strtol]) +AC_CHECK_FUNCS([strtol seteuid]) # Used in lcFile.c (see also --enable-xlocaledir settings below) XLOCALEDIR_IS_SAFE="no" AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"] diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index fb64cb969..db7a1d37b 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -175,14 +175,22 @@ XCOMM "₴" U20b4 HRYVNIA SIGN XCOMM "₵" U20b5 CEDI SIGN +<Multi_key> <bar> <C> : "¢" cent # CENT SIGN <Multi_key> <bar> <c> : "¢" cent # CENT SIGN +<Multi_key> <C> <bar> : "¢" cent # CENT SIGN <Multi_key> <c> <bar> : "¢" cent # CENT SIGN +<Multi_key> <C> <slash> : "¢" cent # CENT SIGN <Multi_key> <c> <slash> : "¢" cent # CENT SIGN +<Multi_key> <slash> <C> : "¢" cent # CENT SIGN <Multi_key> <slash> <c> : "¢" cent # CENT SIGN <Multi_key> <L> <minus> : "£" sterling # POUND SIGN +<Multi_key> <l> <minus> : "£" sterling # POUND SIGN <Multi_key> <minus> <L> : "£" sterling # POUND SIGN +<Multi_key> <minus> <l> : "£" sterling # POUND SIGN <Multi_key> <Y> <equal> : "¥" yen # YEN SIGN +<Multi_key> <y> <equal> : "¥" yen # YEN SIGN <Multi_key> <equal> <Y> : "¥" yen # YEN SIGN +<Multi_key> <equal> <y> : "¥" yen # YEN SIGN XCOMM Long S <Multi_key> <f> <s> : "ſ" U017f # LATIN SMALL LETTER LONG S diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c index c7f13ffe8..576a61124 100644 --- a/libX11/src/xlibi18n/lcFile.c +++ b/libX11/src/xlibi18n/lcFile.c @@ -36,7 +36,7 @@ /************************************************************************/ -#ifdef __UNIXOS2__ +#ifndef HAVE_SETEUID # define seteuid setuid #endif #define iscomment(ch) ((ch) == '#' || (ch) == '\0') |