aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
Diffstat (limited to 'libX11')
-rw-r--r--libX11/configure.ac2
-rw-r--r--libX11/nls/en_US.UTF-8/Compose.pre8
-rw-r--r--libX11/src/xlibi18n/lcFile.c2
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 4e4439773..2c06fa2d7 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')