From: Brian Paul <brianp@vmware.com>
Date: Thu, 24 Mar 2011 14:34:19 +0000 (-0600)
Subject: radeon: reorder #includes to silence warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff2950dd690a2ed9ee96823030ba9edf073c8229;p=mesa.git

radeon: reorder #includes to silence warnings

Silences warnings about RADEON_TILING_SURFACE being redefined.
Only compile tested, not run tested.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
index 60f10496026..607b7470d4b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
@@ -1,6 +1,10 @@
 #ifndef RADEON_CS_WRAPPER_H
 #define RADEON_CS_WRAPPER_H
 
+/* to be used to build locally in mesa with no libdrm bits */
+#include "../radeon/radeon_bo_drm.h"
+#include "../radeon/radeon_cs_drm.h"
+
 #ifdef HAVE_LIBDRM_RADEON
 
 #include "radeon_bo.h"
@@ -24,10 +28,6 @@
 				   * when mapped - i.e. front buffer */
 #endif
 
-/* to be used to build locally in mesa with no libdrm bits */
-#include "../radeon/radeon_bo_drm.h"
-#include "../radeon/radeon_cs_drm.h"
-
 #ifndef DRM_RADEON_GEM_INFO
 #define DRM_RADEON_GEM_INFO 0x1c