summaryrefslogtreecommitdiff
path: root/lib/intel_batchbuffer.h
diff options
context:
space:
mode:
authorOscar Mateo <oscar.mateo@intel.com>2013-11-12 11:50:42 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-12 12:05:55 +0100
commit5032e7bbdd342ac111ab2c57bf82b3dd4d26f208 (patch)
tree19b9398d91faaa1d0d6420417f7446f74d0c12e7 /lib/intel_batchbuffer.h
parentdce0d99a91b4be26c4cd07e7030615fdc46bf2c7 (diff)
build: Fix assorted compilation warnings
As these files are compiled for every test, the warnings cluttered the Android build completely. v2: As suggested by Daniel Vetter, drop some of the fixes and fix the compilation flags instead. Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/intel_batchbuffer.h')
-rw-r--r--lib/intel_batchbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index a7999698..11b7e6e5 100644
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -47,7 +47,7 @@ void intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
* work...
*/
#pragma GCC diagnostic ignored "-Winline"
-static inline int
+static inline unsigned int
intel_batchbuffer_space(struct intel_batchbuffer *batch)
{
return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->buffer);