Mesa (mesa_7_7_branch): st/xorg: Set enforce version to 1 if not defined

[Jakob Bornecrantz]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 3e1241d4f872cca96616edcbdcaea5b59d37e78f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e1241d4f872cca96616edcbdcaea5b59d37e78f

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Jan 15 01:14:55 2010 +0000

st/xorg: Set enforce version to 1 if not defined

---

 src/gallium/state_trackers/xorg/xorg_dri2.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 4fa4754..4f03dba 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -43,9 +43,8 @@
 #include "util/u_rect.h"
 
 /* Make all the #if cases in the code esier to read */
-/* XXX can it be set to 1? */
 #ifndef DRI2INFOREC_VERSION
-#define DRI2INFOREC_VERSION 0
+#define DRI2INFOREC_VERSION 1
 #endif
 
 typedef struct {
@@ -370,11 +369,7 @@ xorg_dri2_init(ScreenPtr pScreen)
     modesettingPtr ms = modesettingPTR(pScrn);
     DRI2InfoRec dri2info;
 
-#if DRI2INFOREC_VERSION >= 2
     dri2info.version = DRI2INFOREC_VERSION;
-#else
-    dri2info.version = 1;
-#endif
     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;