From e2763622941bc35db9a2dbf16e10bb830af07d67 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 13 Dec 2013 12:21:02 -0800 Subject: Don't define 'redirect' stuff in header files Leave it all under #if PRESENT_FUTURE_VERSION for documentation Signed-off-by: Keith Packard --- presentproto.h | 2 ++ presenttokens.h | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/presentproto.h b/presentproto.h index ee65fa4..08ddc05 100644 --- a/presentproto.h +++ b/presentproto.h @@ -196,6 +196,7 @@ typedef struct { } xPresentIdleNotify; #define sz_xPresentIdleNotify 32 +#if PRESENT_FUTURE_VERSION typedef struct { CARD8 type; CARD8 extension; @@ -236,6 +237,7 @@ typedef struct { } xPresentRedirectNotify; #define sz_xPresentRedirectNotify 104 +#endif #undef Window #undef Pixmap diff --git a/presenttokens.h b/presenttokens.h index 807dbcf..acb7576 100644 --- a/presenttokens.h +++ b/presenttokens.h @@ -64,18 +64,28 @@ #define PresentConfigureNotify 0 #define PresentCompleteNotify 1 #define PresentIdleNotify 2 +#if PRESENT_FUTURE_VERSION #define PresentRedirectNotify 3 +#endif /* Event Masks */ #define PresentConfigureNotifyMask 1 #define PresentCompleteNotifyMask 2 #define PresentIdleNotifyMask 4 +#if PRESENT_FUTURE_VERSION #define PresentRedirectNotifyMask 8 +#endif + +#if PRESENT_FUTURE_VERSION +#define PRESENT_REDIRECT_NOTIFY_MASK PresentRedirectNotifyMask +#else +#define PRESENT_REDIRECT_NOTIFY_MASK 0 +#endif #define PresentAllEvents (PresentConfigureNotifyMask | \ PresentCompleteNotifyMask | \ PresentIdleNotifyMask | \ - PresentRedirectNotifyMask) + PRESENT_REDIRECT_NOTIFY_MASK) /* Complete Kinds */ -- cgit v1.2.3