Mesa (master): st/dri: Don't include sw vs drm dri headers

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Thu Mar 25 18:28:31 2010 +0100

st/dri: Don't include sw vs drm dri headers

---

 src/gallium/state_trackers/dri/dri_screen.c |    3 +++
 src/gallium/state_trackers/dri/dri_st_api.c |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 3029d33..598a07b 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -40,9 +40,12 @@
 #include "dri_drawable.h"
 #include "dri_st_api.h"
 #include "dri1_helper.h"
+#ifndef __NOT_HAVE_DRM_H
 #include "dri1.h"
 #include "dri2.h"
+#else
 #include "drisw.h"
+#endif
 
 #include "util/u_inlines.h"
 #include "pipe/p_screen.h"
diff --git a/src/gallium/state_trackers/dri/dri_st_api.c b/src/gallium/state_trackers/dri/dri_st_api.c
index 31d2c58..40b24b1 100644
--- a/src/gallium/state_trackers/dri/dri_st_api.c
+++ b/src/gallium/state_trackers/dri/dri_st_api.c
@@ -36,9 +36,12 @@
 #include "dri_drawable.h"
 #include "dri_st_api.h"
 #include "dri1_helper.h"
+#ifndef __NOT_HAVE_DRM_H
 #include "dri1.h"
 #include "dri2.h"
+#else
 #include "drisw.h"
+#endif
 
 static boolean
 dri_st_framebuffer_validate(struct st_framebuffer_iface *stfbi,