diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /include/dix.h | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'include/dix.h')
| -rw-r--r-- | include/dix.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/dix.h b/include/dix.h index 30fdc45b1..8cfbbc4f6 100644 --- a/include/dix.h +++ b/include/dix.h @@ -145,8 +145,6 @@ extern void UpdateCurrentTime(void); extern void UpdateCurrentTimeIf(void); -extern void InitSelections(void); - extern int dixDestroyPixmap( pointer /*value*/, XID /*pid*/); @@ -172,10 +170,6 @@ extern void DeleteWindowFromAnySelections( extern void MarkClientException( ClientPtr /*client*/); -extern int SendConnSetup( - ClientPtr /*client*/, - char* /*reason*/); - #if defined(DDXBEFORERESET) extern void ddxBeforeReset (void); #endif @@ -336,13 +330,6 @@ extern void EnqueueEvent( DeviceIntPtr /* device */, int /* count */); -extern void ComputeFreezes(void); - -extern void CheckGrabForSyncs( - DeviceIntPtr /* dev */, - Bool /* thisMode */, - Bool /* otherMode */); - extern void ActivatePointerGrab( DeviceIntPtr /* mouse */, GrabPtr /* grab */, |