diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-22 22:04:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-22 22:06:29 +0100 |
| commit | 66215bff25b8961e396ea4a3b1847ac668de3ff4 (patch) | |
| tree | 64e98f6dabdd61a56aa92264176c07d1aa0807df /X11 | |
| parent | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (diff) | |
| download | vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.gz vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.bz2 vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.zip | |
Solved compile problems due to latest merge
Diffstat (limited to 'X11')
| -rw-r--r-- | X11/Intrinsic.h | 2 | ||||
| -rw-r--r-- | X11/Xlib.h | 17 |
2 files changed, 1 insertions, 18 deletions
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( |