summaryrefslogtreecommitdiff
path: root/Xi/exglobals.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-04-02 15:36:26 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-04-02 15:36:26 +0930
commite8777a91f37d828b9df839bf3d9cf2f954bdddb0 (patch)
tree07dbc5bb75954b39eb84809907f58025b3419773 /Xi/exglobals.h
parenta12054757d21edacc1c24c3077b9214726652829 (diff)
parent96ce17aa94413c4b8bcb61cae71167050130a307 (diff)
Merge branch 'master' into mpx
Conflicts: Xi/closedev.c Xi/exevents.c Xi/extinit.c Xi/listdev.c dix/window.c hw/xfree86/common/xf86Xinput.c include/extinit.h mi/mipointer.c
Diffstat (limited to 'Xi/exglobals.h')
-rw-r--r--Xi/exglobals.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index 811375e25..8fcd907a3 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -37,7 +37,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern int IReqCode;
extern int BadDevice;
-extern int BadEvent;
extern int BadMode;
extern int DeviceBusy;
extern int BadClass;
@@ -46,7 +45,6 @@ extern Mask DevicePointerMotionMask;
extern Mask DevicePointerMotionHintMask;
extern Mask DeviceFocusChangeMask;
extern Mask DeviceStateNotifyMask;
-extern Mask ChangeDeviceNotifyMask;
extern Mask DeviceMappingNotifyMask;
extern Mask DeviceOwnerGrabButtonMask;
extern Mask DeviceButtonGrabMask;