From 385dc2b070df1e19853a009bfe32204e0c5b2dd7 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 27 Aug 2016 01:22:46 +0200
Subject: update xlibi18n files to libX11 1.3.4

---
 nx-X11/lib/X11/Xlcint.h | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

(limited to 'nx-X11/lib/X11/Xlcint.h')

diff --git a/nx-X11/lib/X11/Xlcint.h b/nx-X11/lib/X11/Xlcint.h
index db2f75a7b..7b10d8fd7 100644
--- a/nx-X11/lib/X11/Xlcint.h
+++ b/nx-X11/lib/X11/Xlcint.h
@@ -40,31 +40,31 @@ from The Open Group.
  * copyright notice and this permission notice appear in supporting
  * documentation, and that the names of OMRON, NTT Software, NTT, Open
  * Software Foundation, and Sony Corporation not be used in advertising
- * or publicity pertaining to distribution of the software without specific, 
+ * or publicity pertaining to distribution of the software without specific,
  * written prior permission. OMRON, NTT Software, NTT, Open Software
- * Foundation, and Sony Corporation  make no representations about the 
- * suitability of this software for any purpose.  It is provided "as is" 
+ * Foundation, and Sony Corporation  make no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, AND SONY 
- * CORPORATION DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT 
- * SHALL OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, OR SONY 
+ * OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, AND SONY
+ * CORPORATION DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
+ * SHALL OMRON, NTT SOFTWARE, NTT, OPEN SOFTWARE FOUNDATION, OR SONY
  * CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
  * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
+ *
  *	Authors: Li Yuhong		OMRON Corporation
  *		 Tatsuya Kato		NTT Software Corporation
  *		 Hiroshi Kuribayashi	OMRON Coproration
  *		 Muneiyoshi Suzuki	Nippon Telegraph and Telephone Co.
- * 
- *		 M. Collins		OSF  
+ *
+ *		 M. Collins		OSF
  *		 Katsuhisa Yano		TOSHIBA Corp.
  *               Makoto Wakamatsu       Sony Corporation
  *               Takashi Fujiwara	FUJITSU LIMITED
- */				
+ */
 
 
 #ifndef	_XLCINT_H_
@@ -110,7 +110,7 @@ typedef struct {
  * and Input Context
  */
 typedef struct {
-    char		*resource_name;		/* Resource string */
+    const char		*resource_name;		/* Resource string */
     XrmQuark		xrm_name;		/* Resource name quark */
     int			resource_size;		/* Size in bytes of data */
     long		resource_offset;	/* Offset from base */
@@ -352,7 +352,7 @@ typedef struct {
 } XlcArg, *XlcArgList;
 
 typedef struct _XlcResource {
-    char *name;
+    const char *name;
     XrmQuark xrm_name;
     int size;
     int offset;
@@ -434,11 +434,11 @@ typedef char* (*XGetOCValuesProc)(
 );
 
 /*
- * X Font Sets are an instantiable object, so we define it, the 
+ * X Font Sets are an instantiable object, so we define it, the
  * object itself, a method list and data
  */
 
-/* 
+/*
  * XFontSet object method list
  */
 
@@ -596,7 +596,7 @@ typedef struct _XOC {
 
 
 /*
- * X Input Managers are an instantiable object, so we define it, the 
+ * X Input Managers are an instantiable object, so we define it, the
  * object itself, a method list and data.
  */
 
@@ -654,7 +654,7 @@ typedef struct {
 
 
 /*
- * An X Input Manager (IM).  Implementations may need to extend this data 
+ * An X Input Manager (IM).  Implementations may need to extend this data
  * structure to accomodate additional data, state information etc.
  */
 typedef struct _XIM {
@@ -665,13 +665,13 @@ typedef struct _XIM {
 
 
 /*
- * X Input Contexts (IC) are an instantiable object, so we define it, the 
+ * X Input Contexts (IC) are an instantiable object, so we define it, the
  * object itself, a method list and data for this object
  */
 
 /*
  * Input Context method list
- */ 
+ */
 typedef struct {
     void (*destroy)(
 	XIC
@@ -738,7 +738,7 @@ typedef struct {
 
 
 /*
- * an Input Context.  Implementations may need to extend this data 
+ * an Input Context.  Implementations may need to extend this data
  * structure to accomodate additional data, state information etc.
  */
 typedef struct _XIC {
@@ -910,6 +910,11 @@ extern void _XlcAddUtf8LocaleConverters(
     XLCd		lcd
 );
 
+/* Registers GB18030 converters for a GB18030 locale. */
+extern void _XlcAddGB18030LocaleConverters(
+    XLCd		lcd
+);
+
 /* The default locale loader. Assumes an ASCII encoding. */
 extern XLCd _XlcDefaultLoader(
     const char*		name
-- 
cgit v1.2.3