summaryrefslogtreecommitdiffstats
path: root/minui
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-14 21:59:56 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 21:59:56 +0100
commit4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (patch)
tree8fa1fa41069b4c6991157ac484069121caab9767 /minui
parentam a7266ef0: Merge "separate fbdev-specific code out from minui" (diff)
parentMerge "Recovery 64-bit compile issues" (diff)
downloadandroid_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.gz
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.bz2
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.lz
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.xz
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.tar.zst
android_bootable_recovery-4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49.zip
Diffstat (limited to 'minui')
-rw-r--r--minui/graphics_fbdev.c7
-rw-r--r--minui/resources.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/minui/graphics_fbdev.c b/minui/graphics_fbdev.c
index 6a6330b22..bb91975a9 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 df813cb1e..a6528b357 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);