diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-03-14 20:53:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-14 20:53:41 +0000 |
commit | 026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc (patch) | |
tree | 0ce9c3520be76db70f29a63fca0b895a028934af /minui | |
parent | a7266ef0b1804e3ddeea58bda9a416e807a55f88 (diff) | |
parent | f3bb31c32fa879ccce358c15c93b7bd8582d1756 (diff) | |
download | bootable_recovery-026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc.zip bootable_recovery-026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc.tar.gz bootable_recovery-026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc.tar.bz2 |
Merge "Recovery 64-bit compile issues"
Diffstat (limited to 'minui')
-rw-r--r-- | minui/graphics_fbdev.c | 7 | ||||
-rw-r--r-- | minui/resources.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/minui/graphics_fbdev.c b/minui/graphics_fbdev.c index 6a6330b..bb91975 100644 --- a/minui/graphics_fbdev.c +++ b/minui/graphics_fbdev.c @@ -21,6 +21,7 @@ #include <fcntl.h> #include <stdio.h> +#include <sys/cdefs.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/types.h> @@ -55,7 +56,7 @@ minui_backend* open_fbdev() { return &my_backend; } -static void fbdev_blank(minui_backend* backend, bool blank) +static void fbdev_blank(minui_backend* backend __unused, bool blank) { int ret; @@ -174,7 +175,7 @@ static gr_surface fbdev_init(minui_backend* backend) { return gr_draw; } -static gr_surface fbdev_flip(minui_backend* backend) { +static gr_surface fbdev_flip(minui_backend* backend __unused) { if (double_buffered) { // Change gr_draw to point to the buffer currently displayed, // then flip the driver so we're displaying the other buffer @@ -189,7 +190,7 @@ static gr_surface fbdev_flip(minui_backend* backend) { return gr_draw; } -static void fbdev_exit(minui_backend* backend) { +static void fbdev_exit(minui_backend* backend __unused) { close(fb_fd); fb_fd = -1; diff --git a/minui/resources.c b/minui/resources.c index df813cb..a6528b3 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -95,7 +95,7 @@ int res_create_surface(const char* name, gr_surface* pSurface) { png_read_info(png_ptr, info_ptr); int color_type, bit_depth; - size_t width, height; + png_uint_32 width, height; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); |