Mesa (master): st/mesa: re-order #includes in st_manager.c

Brian Paul brianp at kemper.freedesktop.org
Thu Jan 12 08:21:16 PST 2012


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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 12 08:39:11 2012 -0700

st/mesa: re-order #includes in st_manager.c

include mesa headers before gallium headers to avoid problem with
ffs() being defined in u_math.h and then again in imports.h

The next commit will add some #ifdefs to prevent multiple definitions
of ffs().

---

 src/mesa/state_tracker/st_manager.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index b83cb23..63920a3 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -26,16 +26,6 @@
  *    Chia-I Wu <olv at lunarg.com>
  */
 
-#include "state_tracker/st_gl_api.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_screen.h"
-#include "util/u_format.h"
-#include "util/u_pointer.h"
-#include "util/u_inlines.h"
-#include "util/u_atomic.h"
-#include "util/u_surface.h"
-
 #include "main/mtypes.h"
 #include "main/context.h"
 #include "main/mfeatures.h"
@@ -54,6 +44,16 @@
 #include "st_cb_flush.h"
 #include "st_manager.h"
 
+#include "state_tracker/st_gl_api.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_screen.h"
+#include "util/u_format.h"
+#include "util/u_pointer.h"
+#include "util/u_inlines.h"
+#include "util/u_atomic.h"
+#include "util/u_surface.h"
+
 /**
  * Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.
  * Return NULL if the struct gl_framebuffer is a user-created framebuffer.



More information about the mesa-commit mailing list