diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-03 09:54:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:32 +0200 |
| commit | c18d12d1e36354ff32724c86ae25374d1a78607f (patch) | |
| tree | 3db58d40725863f1d1145002f998a6cf0662fbf9 /mesalib/src/gallium/auxiliary | |
| parent | 77f54d0b20cc194e708bc664740e4c0b0e13c3dd (diff) | |
| download | vcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.tar.gz vcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.tar.bz2 vcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.zip | |
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format_yuv.c | 1 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_inlines.h | 4 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_math.h | 1 |
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 |