diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
| commit | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (patch) | |
| tree | 063ea788b90cc200b84b40ce431a7649045de907 /libX11/src/xlibi18n | |
| parent | 697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (diff) | |
| download | vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.gz vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.bz2 vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.zip | |
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
xserver commit 80481267662c8687e73081237913fa561e7a6561
libX11 commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4
libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909
mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b
libXmu commit e02c30fac32e4873240e507cadc416f710188feb
mesa commit 72cae2a599881e926b8709f4dfa2cc3591ea7a02
Diffstat (limited to 'libX11/src/xlibi18n')
| -rw-r--r-- | libX11/src/xlibi18n/Makefile.am | 3 | ||||
| -rw-r--r-- | libX11/src/xlibi18n/XlcPubI.h | 7 | ||||
| -rw-r--r-- | libX11/src/xlibi18n/Xlcint.h | 15 | ||||
| -rw-r--r-- | libX11/src/xlibi18n/lcInit.c | 29 |
4 files changed, 1 insertions, 53 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 |