diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
| commit | 724396e50bc811ea09416afbe00a8420d60647bf (patch) | |
| tree | fd5f6baeaad8ae7cc680dae46e1ae633544ee2a9 /xorg-server/include | |
| parent | 2ddb9669098ba260d0667276b5d1e7999c72b993 (diff) | |
| parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
| download | vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.gz vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.bz2 vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include')
| -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 1d0041e28..c00dd694f 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 const 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_ */
|