diff options
| author | Oscar Mateo <oscar.mateo@intel.com> | 2013-11-12 11:50:42 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-12 12:05:55 +0100 |
| commit | 5032e7bbdd342ac111ab2c57bf82b3dd4d26f208 (patch) | |
| tree | 19b9398d91faaa1d0d6420417f7446f74d0c12e7 /lib/drmtest.c | |
| parent | dce0d99a91b4be26c4cd07e7030615fdc46bf2c7 (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/drmtest.c')
| -rw-r--r-- | lib/drmtest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index 38463f8c..44fd30ee 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -306,7 +306,7 @@ int drm_open_any_render(void) return fd; } -int __gem_set_tiling(int fd, uint32_t handle, int tiling, int stride) +int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride) { struct drm_i915_gem_set_tiling st; int ret; @@ -326,7 +326,7 @@ int __gem_set_tiling(int fd, uint32_t handle, int tiling, int stride) return 0; } -void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride) +void gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride) { igt_assert(__gem_set_tiling(fd, handle, tiling, stride) == 0); } @@ -654,7 +654,7 @@ off_t prime_get_size(int dma_buf_fd) /* signal interrupt helpers */ static bool igt_only_list_subtests(void); -static int exit_handler_count; +static unsigned int exit_handler_count; static struct igt_helper_process signal_helper; long long int sig_stat; |