From 19fbffb63d3d40b6266ddf3de560dbb751cfcd7f Mon Sep 17 00:00:00 2001 From: Deron Johnson Date: Thu, 17 Feb 2005 22:44:14 +0000 Subject: Joined with branch XORG-6_8_2. --- nls/compose.dir.pre | 16 ---------------- nls/locale.dir.pre | 11 ++--------- src/XlibInt.c | 26 -------------------------- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre index c1f53126..ade5d1d2 100644 --- a/nls/compose.dir.pre +++ b/nls/compose.dir.pre @@ -31,7 +31,6 @@ microsoft-cp1251/Compose: bg_BG.CP1251 iso8859-1/Compose: br_FR.ISO8859-1 iso8859-14/Compose: br_FR.ISO8859-14 iso8859-15/Compose: br_FR.ISO8859-15 -iso8859-2/Compose bs_BA.ISO8859-2 iso8859-1/Compose: ca_ES.ISO8859-1 iso8859-15/Compose: ca_ES.ISO8859-15 iso8859-2/Compose: cs_CZ.ISO8859-2 @@ -214,11 +213,6 @@ microsoft-cp1255/Compose: yi_US.CP1256 zh_CN/Compose: zh_CN.eucCN zh_CN/Compose: zh_CN.GB2312 zh_CN.gbk/Compose: zh_CN.GBK -zh_CN.gb18030/Compose: zh_CN.GB18030 -zh_HK.big5/Compose: zh_HK.big5 -zh_HK.big5/Compose: zh_HK.Big5 -zh_HK.big5hkscs/Compose: zh_HK.big5hkscs -zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS zh_TW.big5/Compose: zh_TW.big5 zh_TW.big5/Compose: zh_TW.Big5 zh_TW/Compose: zh_TW.eucTW @@ -240,12 +234,10 @@ en_US.UTF-8/Compose: ar_QA.UTF-8 en_US.UTF-8/Compose: ar_SA.UTF-8 en_US.UTF-8/Compose: ar_TN.UTF-8 en_US.UTF-8/Compose: ar_YE.UTF-8 -en_US.UTF-8/Compose bs_BA.UTF-8 en_US.UTF-8/Compose: az_AZ.UTF-8 en_US.UTF-8/Compose: a3_AZ.UTF-8 en_US.UTF-8/Compose: be_BY.UTF-8 en_US.UTF-8/Compose: bg_BG.UTF-8 -en_US.UTF-8/Compose: bn_IN.UTF-8 en_US.UTF-8/Compose: br_FR.UTF-8 en_US.UTF-8/Compose: ca_ES.UTF-8 en_US.UTF-8/Compose: cs_CZ.UTF-8 @@ -303,7 +295,6 @@ en_US.UTF-8/Compose: fr_LU.UTF-8 en_US.UTF-8/Compose: ga_IE.UTF-8 en_US.UTF-8/Compose: gd_GB.UTF-8 en_US.UTF-8/Compose: gl_ES.UTF-8 -en_US.UTF-8/Compose: gu_IN.UTF-8 en_US.UTF-8/Compose: gv_GB.UTF-8 en_US.UTF-8/Compose: he_IL.UTF-8 en_US.UTF-8/Compose: hi_IN.UTF-8 @@ -315,10 +306,8 @@ en_US.UTF-8/Compose: is_IS.UTF-8 en_US.UTF-8/Compose: it_CH.UTF-8 en_US.UTF-8/Compose: it_IT.UTF-8 en_US.UTF-8/Compose: iu_CA.UTF-8 -en_US.UTF-8/Compose: ja_JP.UTF-8 en_US.UTF-8/Compose: ka_GE.UTF-8 en_US.UTF-8/Compose: kl_GL.UTF-8 -en_US.UTF-8/Compose: ko_KR.UTF-8 en_US.UTF-8/Compose: kw_GB.UTF-8 en_US.UTF-8/Compose: lo_LA.UTF-8 en_US.UTF-8/Compose: lt_LT.UTF-8 @@ -332,7 +321,6 @@ en_US.UTF-8/Compose: no_NO.UTF-8 en_US.UTF-8/Compose: nb_NO.UTF-8 en_US.UTF-8/Compose: ny_NO.UTF-8 en_US.UTF-8/Compose: oc_FR.UTF-8 -en_US.UTF-8/Compose: pa_IN.UTF-8 en_US.UTF-8/Compose: pd_DE.UTF-8 en_US.UTF-8/Compose: pd_US.UTF-8 en_US.UTF-8/Compose: ph_PH.UTF-8 @@ -343,7 +331,6 @@ en_US.UTF-8/Compose: pt_PT.UTF-8 en_US.UTF-8/Compose: ro_RO.UTF-8 en_US.UTF-8/Compose: ru_RU.UTF-8 en_US.UTF-8/Compose: ru_UA.UTF-8 -en_US.UTF-8/Compose: si_LK.UTF-8 en_US.UTF-8/Compose: sk_SK.UTF-8 en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 @@ -362,6 +349,3 @@ en_US.UTF-8/Compose: uz_UZ.UTF-8 en_US.UTF-8/Compose: vi_VN.UTF-8 en_US.UTF-8/Compose: wa_BE.UTF-8 en_US.UTF-8/Compose: yi_US.UTF-8 -en_US.UTF-8/Compose: zh_TW.UTF-8 -iso8859-2/Compose: bs_BA.ISO8859-2 -en_US.UTF-8/Compose: bs_BA.UTF-8 diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index 6cbea698..2ca65573 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.7 2005-01-19 01:53:55 gisburn Exp $ +XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.2.18.1 2005-02-17 22:44:28 deronj Exp $ XCOMM $Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ XCOMM XCOMM This file contains locale database file names @@ -34,7 +34,6 @@ microsoft-cp1251/XLC_LOCALE: be_BY.CP1251 iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5 microsoft-cp1251/XLC_LOCALE: bg_BG.CP1251 koi8-r/XLC_LOCALE: bg_BG.KOI8-R -iso8859-2/XLC_LOCALE bs_BA.ISO8859-2 iso8859-1/XLC_LOCALE: br_FR.ISO8859-1 iso8859-14/XLC_LOCALE: br_FR.ISO8859-14 iso8859-15/XLC_LOCALE: br_FR.ISO8859-15 @@ -229,7 +228,6 @@ microsoft-cp1255/XLC_LOCALE: yi_US.CP1255 zh_CN/XLC_LOCALE: zh_CN.eucCN zh_CN/XLC_LOCALE: zh_CN.gb2312 zh_CN.gbk/XLC_LOCALE: zh_CN.gbk -zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030 zh_HK.big5/XLC_LOCALE: zh_HK.big5 zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS @@ -252,7 +250,6 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8 -en_US.UTF-8/XLC_LOCALE bs_BA.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8 @@ -264,7 +261,6 @@ en_US.UTF-8/XLC_LOCALE: a3_AZ.UTF-8 en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8 en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8 en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8 -en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8 en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 @@ -324,7 +320,6 @@ en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8 en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8 en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8 -en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8 en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8 @@ -355,7 +350,6 @@ en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8 -en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8 en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8 en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8 en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8 @@ -368,7 +362,6 @@ en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8 en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8 en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8 en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8 -en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8 en_US.UTF-8/XLC_LOCALE: sk_SK.UTF-8 en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8 en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8 @@ -390,7 +383,7 @@ en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8 en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8 en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8 zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8 -zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8 +zh_CN.UTF-8/XLC_LOCALE: zh_HK.UTF-8 zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8 zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8 #ifdef __uxp__ diff --git a/src/XlibInt.c b/src/XlibInt.c index 17ed4cce..33c60973 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -35,17 +35,11 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES -#ifdef WIN32 -#define _XLIBINT_ -#endif #include "Xlibint.h" #include #include #include #include -#ifdef WIN32 -#include -#endif #ifdef XTHREADS #include "locking.h" @@ -3404,23 +3398,3 @@ int _XAccessFile(path) #endif -#ifdef WIN32 -#undef _Xdebug -int _Xdebug = 0; -int *_Xdebug_p = &_Xdebug; -void (**_XCreateMutex_fn_p)(LockInfoPtr) = &_XCreateMutex_fn; -void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn; -void (**_XLockMutex_fn_p)(LockInfoPtr -#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) - , char * /* file */ - , int /* line */ -#endif - ) = &_XLockMutex_fn; -void (**_XUnlockMutex_fn_p)(LockInfoPtr -#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) - , char * /* file */ - , int /* line */ -#endif - ) = &_XUnlockMutex_fn; -LockInfoPtr *_Xglobal_lock_p = &_Xglobal_lock; -#endif -- cgit v1.2.3