From 66215bff25b8961e396ea4a3b1847ac668de3ff4 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Dec 2013 22:04:41 +0100 Subject: Solved compile problems due to latest merge --- X11/Intrinsic.h | 2 +- X11/Xlib.h | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'X11') diff --git a/X11/Intrinsic.h b/X11/Intrinsic.h index 44a1b360a..0488be908 100644 --- a/X11/Intrinsic.h +++ b/X11/Intrinsic.h @@ -113,7 +113,7 @@ typedef struct _XtEventRec *XtEventTable; typedef struct _XtAppStruct *XtAppContext; typedef unsigned long XtValueMask; -typedef unsigned long XtIntervalId; +typedef uintptr_t XtIntervalId; typedef unsigned long XtInputId; typedef unsigned long XtWorkProcId; typedef unsigned long XtSignalId; diff --git a/X11/Xlib.h b/X11/Xlib.h index f29976354..8ecaea48f 100644 --- a/X11/Xlib.h +++ b/X11/Xlib.h @@ -58,23 +58,11 @@ typedef unsigned long wchar_t; #endif #endif -#if defined(ISC) && defined(USE_XMBTOWC) -#define wctomb(a,b) _Xwctomb(a,b) -#define mblen(a,b) _Xmblen(a,b) -#ifndef USE_XWCHAR_STRING -#define mbtowc(a,b,c) _Xmbtowc(a,b,c) -#endif -#endif extern int _Xmblen( -#ifdef ISC - char const *str, - size_t len -#else char *str, int len -#endif ); /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in @@ -3999,13 +3987,8 @@ extern void XSetAuthorization( extern int _Xmbtowc( wchar_t * /* wstr */, -#ifdef ISC - char const * /* str */, - size_t /* len */ -#else char * /* str */, int /* len */ -#endif ); extern int _Xwctomb( -- cgit v1.2.3