diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-14 11:05:22 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-14 11:05:22 -0700 |
| commit | 6d86b64dbaef5a16712fd1fdc3157f716d238877 (patch) | |
| tree | 27350a2906ab3cb99e9e507f48ac5a9f4508659f /include | |
| parent | 812786f4d4306cb16f8ed57fa4a1a32bb1d13fe3 (diff) | |
| parent | 4c68f5d395c66f28b56e488cb3cd12f36820357b (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix.h | 2 | ||||
| -rw-r--r-- | include/input.h | 2 | ||||
| -rw-r--r-- | include/misc.h | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/dix.h b/include/dix.h index 5dc2ac568..3d8b0e575 100644 --- a/include/dix.h +++ b/include/dix.h @@ -395,6 +395,8 @@ DeliverTouchEvents(DeviceIntPtr /* dev */ , extern void InitializeSprite(DeviceIntPtr /* pDev */ , WindowPtr /* pWin */ ); +extern void +FreeSprite(DeviceIntPtr pDev); extern void UpdateSpriteForScreen(DeviceIntPtr /* pDev */ , diff --git a/include/input.h b/include/input.h index bcf98a63e..5747f3cd2 100644 --- a/include/input.h +++ b/include/input.h @@ -264,7 +264,7 @@ extern _X_EXPORT Bool ActivateDevice(DeviceIntPtr /*device */ , extern _X_EXPORT Bool DisableDevice(DeviceIntPtr /*device */ , BOOL /* sendevent */ ); - +extern void DisableAllDevices(void); extern int InitAndStartDevices(void); extern void CloseDownDevices(void); diff --git a/include/misc.h b/include/misc.h index 41c13332a..fea74b86c 100644 --- a/include/misc.h +++ b/include/misc.h @@ -381,4 +381,16 @@ extern _X_EXPORT unsigned long serverGeneration; #define BUG_WARN(cond) __BUG_WARN_MSG(cond, 0, NULL) +#define BUG_RETURN(cond) \ + do { if (cond) { __BUG_WARN_MSG(cond, 0, NULL); return; } } while(0) + +#define BUG_RETURN_MSG(cond, ...) \ + do { if (cond) { __BUG_WARN_MSG(cond, 1, __VA_ARGS__); return; } } while(0) + +#define BUG_RETURN_VAL(cond, val) \ + do { if (cond) { __BUG_WARN_MSG(cond, 0, NULL); return (val); } } while(0) + +#define BUG_RETURN_VAL_MSG(cond, val, ...) \ + do { if (cond) { __BUG_WARN_MSG(cond, 1, __VA_ARGS__); return (val); } } while(0) + #endif /* MISC_H */ |