aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-03 09:54:39 +0200
committermarha <marha@users.sourceforge.net>2012-09-03 09:54:39 +0200
commitb86e8562b1ddca2a8bc29f22a79451a041bf5293 (patch)
tree60fead0638fce6922b4043767fa991ff1f0e3488 /mesalib/src/gallium/auxiliary/util
parent53192e17e55aa9ed3e3721bf4fdcb2b01a595202 (diff)
downloadvcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.gz
vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.tar.bz2
vcxsrv-b86e8562b1ddca2a8bc29f22a79451a041bf5293.zip
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_format_yuv.c1
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_inlines.h4
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_math.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_yuv.c b/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
index c7fdaa04f..891d99cf6 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
+++ b/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
@@ -34,6 +34,7 @@
*/
+#include "util/u_debug.h"
#include "util/u_format_yuv.h"
diff --git a/mesalib/src/gallium/auxiliary/util/u_inlines.h b/mesalib/src/gallium/auxiliary/util/u_inlines.h
index a1ece415f..033c100ed 100644
--- a/mesalib/src/gallium/auxiliary/util/u_inlines.h
+++ b/mesalib/src/gallium/auxiliary/util/u_inlines.h
@@ -301,8 +301,8 @@ pipe_buffer_flush_mapped_range(struct pipe_context *pipe,
int transfer_offset;
assert(length);
- assert(transfer->box.x <= offset);
- assert(offset + length <= transfer->box.x + transfer->box.width);
+ assert(transfer->box.x <= (int) offset);
+ assert((int) (offset + length) <= transfer->box.x + transfer->box.width);
/* Match old screen->buffer_flush_mapped_range() behaviour, where
* offset parameter is relative to the start of the buffer, not the
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h
index 90b421ed8..4047bd9b0 100644
--- a/mesalib/src/gallium/auxiliary/util/u_math.h
+++ b/mesalib/src/gallium/auxiliary/util/u_math.h
@@ -40,7 +40,6 @@
#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
#ifdef __cplusplus