summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-05-03 09:26:25 -0600
committerBrian Paul <[email protected]>2008-05-03 09:26:25 -0600
commit736f535b4f1c5e6912b5b2fe9415a3b44a678844 (patch)
treec69d582b4322caa184dfe7d29b7272257bbe0ebf
parentbc57a7c9f7e5f70d77e7f02da2a214a56fad1d80 (diff)
gallium: fix warnings
-rw-r--r--src/gallium/winsys/xlib/xm_winsys.c2
-rw-r--r--src/mesa/state_tracker/st_atom_sampler.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/winsys/xlib/xm_winsys.c b/src/gallium/winsys/xlib/xm_winsys.c
index 641ec116529..14c3892559b 100644
--- a/src/gallium/winsys/xlib/xm_winsys.c
+++ b/src/gallium/winsys/xlib/xm_winsys.c
@@ -606,7 +606,7 @@ xmesa_get_pipe_winsys_aub(struct xmesa_visual *xm_vis)
}
-struct pipe_winsys *
+static struct pipe_winsys *
xmesa_get_pipe_winsys(struct xmesa_visual *xm_vis)
{
static struct xmesa_pipe_winsys *ws = NULL;
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 379b41c654f..10283d31a19 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -32,12 +32,14 @@
*/
+#include "main/macros.h"
+
#include "st_context.h"
#include "st_atom.h"
#include "st_program.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
-#include "pipe/p_util.h"
+
#include "cso_cache/cso_context.h"