diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
| commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
| tree | 221ee6420074033279921fadc971d30d63d6847b /xorg-server/include | |
| parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
| download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip | |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/eventconvert.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 17 |
2 files changed, 0 insertions, 19 deletions
diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h index 4c56d534a..01172f0ee 100644 --- a/xorg-server/include/eventconvert.h +++ b/xorg-server/include/eventconvert.h @@ -29,8 +29,6 @@ #include "events.h" #include "eventstr.h" -#define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16)) - _X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count); _X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count); _X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi); diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index d58478543..2b926a980 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -835,23 +835,6 @@ extern void XkbFakeDeviceButton(DeviceIntPtr /* dev */ , #define _XkbListGeometry 4 #define _XkbListNumComponents 5 -typedef struct _XkbSrvListInfo { - int szPool; - int nPool; - char *pool; - - int maxRtrn; - int nTotal; - - char *pattern[_XkbListNumComponents]; - int nFound[_XkbListNumComponents]; -} XkbSrvListInfoRec, *XkbSrvListInfoPtr; - -extern _X_EXPORT Status XkbDDXList(DeviceIntPtr /* dev */ , - XkbSrvListInfoPtr /* listing */ , - ClientPtr /* client */ - ); - extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ , XkbComponentNamesPtr /* names */ , |