[PATCH] xserver: don't call struct members bool.
Dave Airlie
airlied at gmail.com
Tue Jul 1 15:07:21 PDT 2014
From: Dave Airlie <airlied at redhat.com>
When you include files from mesa that might want to use stdbool
things get messed up.
This is an API break I think and I've no idea what drivers might
use this, so we can hold off on it.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
hw/xfree86/common/xf86Opt.h | 2 +-
hw/xwin/winconfig.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
index 3be2a0f..7306382 100644
--- a/hw/xfree86/common/xf86Opt.h
+++ b/hw/xfree86/common/xf86Opt.h
@@ -41,7 +41,7 @@ typedef union {
unsigned long num;
const char *str;
double realnum;
- Bool bool;
+ Bool bval;
OptFrequency freq;
} ValueUnion;
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 798c779..52c6b22 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -200,7 +200,7 @@ typedef union {
unsigned long num;
char *str;
double realnum;
- Bool bool;
+ Bool bval;
OptFrequency freq;
} ValueUnion;
--
1.9.3
More information about the xorg-devel
mailing list