Mesa (master): gallium: Always include xorg-server. h before other X server headers.

Michel Dänzer daenzer at kemper.freedesktop.org
Thu Apr 23 13:54:57 UTC 2009


Module: Mesa
Branch: master
Commit: 49ba80dff335226a54dae60477b256384005b393
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49ba80dff335226a54dae60477b256384005b393

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Apr 23 12:20:22 2009 +0100

gallium: Always include xorg-server.h before other X server headers.

Various breakage otherwise, e.g. _XSERVER64 not being defined on 64 bit leading
to inconsistent definitions of X server internal structs.

---

 src/gallium/state_trackers/xorg/xorg_dri2.c |    1 +
 src/gallium/state_trackers/xorg/xorg_exa.c  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 0d29b1e..401bd39 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -28,6 +28,7 @@
  *
  */
 
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index ee61de1..d743e1e 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -28,6 +28,7 @@
  *
  */
 
+#include "xorg-server.h"
 #include "xf86.h"
 #include "xorg_tracker.h"
 




More information about the mesa-commit mailing list