diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
| commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
| tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /libX11/src/xkb/XKBGAlloc.c | |
| parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'libX11/src/xkb/XKBGAlloc.c')
| -rwxr-xr-x[-rw-r--r--] | libX11/src/xkb/XKBGAlloc.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libX11/src/xkb/XKBGAlloc.c b/libX11/src/xkb/XKBGAlloc.c index 3f4f49670..1c90af1e8 100644..100755 --- a/libX11/src/xkb/XKBGAlloc.c +++ b/libX11/src/xkb/XKBGAlloc.c @@ -33,30 +33,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #include <unistd.h> -#ifndef XKB_IN_SERVER #include "Xlibint.h" #include "XKBlibint.h" #include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKBproto.h> -#else - -#include <X11/X.h> -#include <X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include <X11/extensions/XKBsrv.h> -#include <X11/extensions/XKBgeom.h> - -#endif /* XKB_IN_SERVER */ - -#ifdef X_NOT_POSIX -#define Size_t unsigned int -#else -#define Size_t size_t -#endif - /***====================================================================***/ static void @@ -477,7 +459,7 @@ _XkbGeomAlloc( XPointer * old, unsigned short * num, unsigned short * total, int num_new, - Size_t sz_elem) + size_t sz_elem) { if (num_new<1) return Success; |