diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 07:52:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 07:52:57 +0000 |
| commit | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (patch) | |
| tree | 3b69fe26769dc019dba91d2da08a2639ddd31e41 /xorg-server/include/xkbsrv.h | |
| parent | a9768b035f2c47be0908520474073cc68d225d8a (diff) | |
| download | vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.gz vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.bz2 vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.zip | |
Git update 25/1/2010
Diffstat (limited to 'xorg-server/include/xkbsrv.h')
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index ebc7cdbb8..c309465f1 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -275,10 +275,10 @@ typedef struct device->public.realInputProc = oldprocs->realInputProc; \ device->unwrapProc = oldprocs->unwrapProc; -extern _X_EXPORT DevPrivateKey xkbDevicePrivateKey; +extern DevPrivateKey xkbDevicePrivateKey; #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey)) -extern _X_EXPORT void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); +extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); /***====================================================================***/ @@ -299,12 +299,6 @@ extern _X_EXPORT char * XkbBinDirectory; extern _X_EXPORT CARD32 xkbDebugFlags; -#define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t))) -#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t))) -#define _XkbTypedRealloc(o,n,t) \ - ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t)) -#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t)) - #define _XkbLibError(c,l,d) /* Epoch fail */ #define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) #define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) @@ -313,13 +307,6 @@ extern _X_EXPORT CARD32 xkbDebugFlags; extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify; extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease; -#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress)) -#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease)) - -#define XConvertCase(s,l,u) XkbConvertCase(s,l,u) -#undef IsKeypadKey -#define IsKeypadKey(s) XkbKSIsKeypad(s) - #define Status int #ifndef True @@ -1000,6 +987,4 @@ extern _X_EXPORT XkbDescPtr XkbCompileKeymap( XkbRMLVOSet * /* rmlvo */ ); -#define XkbAtomGetString(s) NameForAtom(s) - #endif /* _XKBSRV_H_ */ |