Mesa (master): gallium/st + hgl: Build fixes for Haiku

[Alexander von Gluck IV]

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

Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date:   Wed May 13 09:40:01 2015 -0500

gallium/st + hgl: Build fixes for Haiku

* No impact risk to any other platforms
* Tracing printf needs stdio.h now due to child header change
* Add missing #/src include directory for util/macros.h

---

 src/gallium/state_trackers/hgl/hgl.c                  |    2 ++
 src/gallium/targets/haiku-softpipe/GalliumContext.cpp |    2 ++
 src/hgl/SConscript                                    |    1 +
 3 files changed, 5 insertions(+)

diff --git a/src/gallium/state_trackers/hgl/hgl.c b/src/gallium/state_trackers/hgl/hgl.c
index b75dc26..77f7c22 100644
--- a/src/gallium/state_trackers/hgl/hgl.c
+++ b/src/gallium/state_trackers/hgl/hgl.c
@@ -10,6 +10,8 @@
 
 #include "GLView.h"
 
+#include <stdio.h>
+
 #include "pipe/p_format.h"
 #include "util/u_atomic.h"
 #include "util/u_format.h"
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index f9d7dfc..b24aef7 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -10,6 +10,8 @@
 
 #include "GalliumContext.h"
 
+#include <stdio.h>
+
 #include "GLView.h"
 
 #include "bitmap_wrapper.h"
diff --git a/src/hgl/SConscript b/src/hgl/SConscript
index 70db149..71881f5 100644
--- a/src/hgl/SConscript
+++ b/src/hgl/SConscript
@@ -6,6 +6,7 @@ Import('*')
 env = env.Clone()
 
 env.Append(CPPPATH = [
+    '#/src',
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',