From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Thu, 25 Mar 2010 17:28:31 +0000 (+0100)
Subject: st/dri: Don't include sw vs drm dri headers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9eaadfeaa54d15fc3eb90d4137795ace4f920b2f;p=mesa.git

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

diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 3029d337878..598a07bb646 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 31d2c582aa0..40b24b18e9f 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,