aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xlibi18n
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
committermarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
commit0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch)
tree8239768e506a03837019c4f02c8ab949c04a0818 /libX11/src/xlibi18n
parent7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff)
parenta473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff)
downloadvcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013 Conflicts: libXinerama/src/Xinerama.c
Diffstat (limited to 'libX11/src/xlibi18n')
-rw-r--r--libX11/src/xlibi18n/Makefile.am3
-rw-r--r--libX11/src/xlibi18n/XlcPubI.h7
-rw-r--r--libX11/src/xlibi18n/Xlcint.h15
-rw-r--r--libX11/src/xlibi18n/lcInit.c29
-rwxr-xr-x[-rw-r--r--]libX11/src/xlibi18n/makefile43
5 files changed, 1 insertions, 96 deletions
diff --git a/libX11/src/xlibi18n/Makefile.am b/libX11/src/xlibi18n/Makefile.am
index 853953adc..28b3fe3ec 100644
--- a/libX11/src/xlibi18n/Makefile.am
+++ b/libX11/src/xlibi18n/Makefile.am
@@ -35,8 +35,7 @@ IM_LIBS = \
LC_LIBS = \
${top_builddir}/modules/lc/def/libxlcDef.la \
${top_builddir}/modules/lc/gen/libxlibi18n.la \
- ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
- ${top_builddir}/modules/lc/xlocale/libxlocale.la
+ ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la
OM_LIBS = \
${top_builddir}/modules/om/generic/libxomGeneric.la
diff --git a/libX11/src/xlibi18n/XlcPubI.h b/libX11/src/xlibi18n/XlcPubI.h
index a83d24305..2e6890d2f 100644
--- a/libX11/src/xlibi18n/XlcPubI.h
+++ b/libX11/src/xlibi18n/XlcPubI.h
@@ -232,12 +232,6 @@ extern void _XlcGetLocaleDataBase(
int* /* count */
);
-#ifdef X_LOCALE
-extern char *
-_Xsetlocale(
- int category,
- _Xconst char *name);
-#else
#ifdef __APPLE__
extern char *
_Xsetlocale(
@@ -247,7 +241,6 @@ _Xsetlocale(
extern char *_XlcMapOSLocaleName(
char *osname,
char *siname);
-#endif
extern int
_Xmbstoutf8(
diff --git a/libX11/src/xlibi18n/Xlcint.h b/libX11/src/xlibi18n/Xlcint.h
index 95d1f5d5c..ebef95ba1 100644
--- a/libX11/src/xlibi18n/Xlcint.h
+++ b/libX11/src/xlibi18n/Xlcint.h
@@ -932,21 +932,6 @@ extern XLCd _XlcUtf8Loader(
const char* name
);
-/* The old EUC locale loader. */
-extern XLCd _XlcEucLoader(
- const char* name
-);
-
-/* The old SJIS locale loader. */
-extern XLCd _XlcSjisLoader(
- const char* name
-);
-
-/* The old ISO-2022-JP locale loader. */
-extern XLCd _XlcJisLoader(
- const char* name
-);
-
extern XLCd _XlcDynamicLoad(
const char* name
);
diff --git a/libX11/src/xlibi18n/lcInit.c b/libX11/src/xlibi18n/lcInit.c
index 5aaf1832b..e3092f77d 100644
--- a/libX11/src/xlibi18n/lcInit.c
+++ b/libX11/src/xlibi18n/lcInit.c
@@ -106,11 +106,6 @@ Sun Microsystems, Inc. or its licensors is granted.
#define USE_GENERIC_LOADER
#define USE_DEFAULT_LOADER
#define USE_UTF8_LOADER
-#ifdef X_LOCALE
-# define USE_EUC_LOADER
-# define USE_SJIS_LOADER
-# define USE_JIS_LOADER
-#endif
#endif
/*
@@ -138,18 +133,6 @@ _XlcInitLoader(void)
_XlcAddLoader(_XlcUtf8Loader, XlcHead);
#endif
-#ifdef USE_EUC_LOADER
- _XlcAddLoader(_XlcEucLoader, XlcHead);
-#endif
-
-#ifdef USE_SJIS_LOADER
- _XlcAddLoader(_XlcSjisLoader, XlcHead);
-#endif
-
-#ifdef USE_JIS_LOADER
- _XlcAddLoader(_XlcJisLoader, XlcHead);
-#endif
-
#ifdef USE_DYNAMIC_LOADER
_XlcAddLoader(_XlcDynamicLoader, XlcHead);
#endif
@@ -177,18 +160,6 @@ _XlcDeInitLoader(void)
_XlcRemoveLoader(_XlcUtf8Loader);
#endif
-#ifdef USE_EUC_LOADER
- _XlcRemoveLoader(_XlcEucLoader);
-#endif
-
-#ifdef USE_SJIS_LOADER
- _XlcRemoveLoader(_XlcSjisLoader);
-#endif
-
-#ifdef USE_JIS_LOADER
- _XlcRemoveLoader(_XlcJisLoader);
-#endif
-
#ifdef USE_DYNAMIC_LOADER
_XlcRemoveLoader(_XlcDynamicLoader);
#endif
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile
index ec9b946b8..01fcfa26d 100644..100755
--- a/libX11/src/xlibi18n/makefile
+++ b/libX11/src/xlibi18n/makefile
@@ -1,48 +1,5 @@
-#AM_CFLAGS= \
-# -I$(top_srcdir)/include \
-# -I$(top_srcdir)/include/X11 \
-# -I$(top_builddir)/include \
-# -I$(top_builddir)/include/X11 \
-# -I$(top_srcdir)/src/xcms \
-# -I$(top_srcdir)/src/xkb \
-# -I$(top_srcdir)/src/xlibi18n \
-# -I$(top_srcdir)/src \
-# $(X11_CFLAGS) \
-# $(BIGFONT_CFLAGS) \
-# $(XDMCP_CFLAGS) \
-# -D_BSD_SOURCE \
-# $(XMALLOC_ZERO_CFLAGS)
-
LIBRARY = libi18n
-
-#
-# Dynamic loading code for i18n modules
-#
-#if XLIB_LOADABLE_I18N
-#XI18N_DL_SOURCES = \
-# XlcDL.c \
-# XlcSL.c
-#else
-#
-# Static interfaces to input/output methods
-#
-#IM_LIBS = \
-# ${top_builddir}/modules/im/ximcp/libximcp.la
-
-#LC_LIBS = \
-# ${top_builddir}/modules/lc/def/libxlcDef.la \
-# ${top_builddir}/modules/lc/gen/libxlibi18n.la \
-# ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
-# ${top_builddir}/modules/lc/xlocale/libxlocale.la
-
-#OM_LIBS = \
-# ${top_builddir}/modules/om/generic/libxomGeneric.la
-#endif
-
-#libi18n_la_LIBADD = \
-# $(IM_LIBS) $(LC_LIBS) $(OM_LIBS)
-
INCLUDES += ..\..\include\X11 ..
DEFINES += XLOCALELIBDIR="\".\"" LIB11_DLL