aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/Ximint.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/Ximint.h
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/Ximint.h')
-rw-r--r--nx-X11/lib/X11/Ximint.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/nx-X11/lib/X11/Ximint.h b/nx-X11/lib/X11/Ximint.h
index 01a535426..f39053f84 100644
--- a/nx-X11/lib/X11/Ximint.h
+++ b/nx-X11/lib/X11/Ximint.h
@@ -12,7 +12,7 @@ Sony Corporation not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission. FUJITSU LIMITED and Sony Corporation makes no
representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
+purpose. It is provided "as is" without express or implied warranty.
FUJITSU LIMITED AND SONY CORPORATION DISCLAIM ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
@@ -21,9 +21,9 @@ 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 OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+PERFORMANCE OF THIS SOFTWARE.
- Author: Takashi Fujiwara FUJITSU LIMITED
+ Author: Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
Motifier: Makoto Wakamatsu Sony Corporation
makoto@sm.sony.co.jp
@@ -178,6 +178,8 @@ typedef struct _XimDefICValues {
#define XIM_FALSE False
#define XIM_OVERFLOW (-1)
+#define BRL_UC_ROW 0x2800
+
/*
* Global symbols
*/
@@ -225,7 +227,7 @@ extern Bool _XimCheckCreateICValues(
extern XIMResourceList _XimGetResourceListRec(
XIMResourceList res_list,
unsigned int list_num,
- char *name
+ const char *name
);
extern void _XimSetIMMode(
@@ -581,7 +583,7 @@ extern char * _XimEncodeIMATTRIBUTE(
Xim im,
XIMResourceList res_list,
unsigned int res_num,
- XIMArg *arg,
+ XIMArg *arg,
XIMArg **arg_ret,
char *buf,
int size,
@@ -594,7 +596,7 @@ extern char * _XimEncodeICATTRIBUTE(
Xic ic,
XIMResourceList res_list,
unsigned int res_num,
- XIMArg *arg,
+ XIMArg *arg,
XIMArg **arg_ret,
char *buf,
int size,
@@ -668,6 +670,10 @@ extern int _XimLcctstoutf8(
Status *state
);
+extern char _XimGetMyEndian(
+ void
+);
+
extern int _XimCheckDataSize(
XPointer buf,
int len
@@ -833,14 +839,6 @@ extern Bool _XimRead(
XPointer arg
);
-extern Bool _XimIntrCallback(
- Xim im,
- Bool (*callback)(
- Xim, INT16, XPointer, XPointer
- ),
- XPointer call_data
-);
-
extern void _XimFlush(
Xim im
);
@@ -862,9 +860,9 @@ extern CARD32 _XimExtenArgCheck(
#endif
extern Bool _XimCbDispatch(
- Xim im,
- INT16 len,
- XPointer data,
+ Xim im,
+ INT16 len,
+ XPointer data,
XPointer call_data
);