diff options
| author | Colin Cross <ccross@android.com> | 2014-02-06 03:03:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 03:03:12 +0000 |
| commit | 5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb (patch) | |
| tree | a9ff44b96a4caaa4cafa16729dfcaae9149a26d1 /modules | |
| parent | 8ded7780c6658d6db011f642206726234098388f (diff) | |
| parent | 037335ebe826289445fd2ba14e95ff41d57ad928 (diff) | |
| download | hardware_libhardware-5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb.zip hardware_libhardware-5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb.tar.gz hardware_libhardware-5dbc98ff2c6714d66a1377ed9c9030d130ed7ebb.tar.bz2 | |
am 037335eb: Merge "gralloc: fix warnings"
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
gralloc: fix warnings
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gralloc/Android.mk | 4 | ||||
| -rw-r--r-- | modules/gralloc/gralloc.cpp | 2 | ||||
| -rw-r--r-- | modules/gralloc/gralloc_priv.h | 2 | ||||
| -rw-r--r-- | modules/gralloc/mapper.cpp | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk index e1fd7d4..a4ffd20 100644 --- a/modules/gralloc/Android.mk +++ b/modules/gralloc/Android.mk @@ -26,8 +26,8 @@ LOCAL_SRC_FILES := \ gralloc.cpp \ framebuffer.cpp \ mapper.cpp - + LOCAL_MODULE := gralloc.default -LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" +LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers include $(BUILD_SHARED_LIBRARY) diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp index f832f35..bdc789d 100644 --- a/modules/gralloc/gralloc.cpp +++ b/modules/gralloc/gralloc.cpp @@ -166,7 +166,7 @@ static int gralloc_alloc_framebuffer(alloc_device_t* dev, } static int gralloc_alloc_buffer(alloc_device_t* dev, - size_t size, int usage, buffer_handle_t* pHandle) + size_t size, int /*usage*/, buffer_handle_t* pHandle) { int err = 0; int fd = -1; diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h index 86a5d52..9f32d58 100644 --- a/modules/gralloc/gralloc_priv.h +++ b/modules/gralloc/gralloc_priv.h @@ -75,7 +75,7 @@ struct private_handle_t { int offset; // FIXME: the attributes below should be out-of-line - int base; + uintptr_t base; int pid; #ifdef __cplusplus diff --git a/modules/gralloc/mapper.cpp b/modules/gralloc/mapper.cpp index 13baf2a..5a882e2 100644 --- a/modules/gralloc/mapper.cpp +++ b/modules/gralloc/mapper.cpp @@ -43,7 +43,7 @@ pid_t gettid() { return syscall(__NR_gettid);} /*****************************************************************************/ -static int gralloc_map(gralloc_module_t const* module, +static int gralloc_map(gralloc_module_t const* /*module*/, buffer_handle_t handle, void** vaddr) { @@ -56,7 +56,7 @@ static int gralloc_map(gralloc_module_t const* module, ALOGE("Could not mmap %s", strerror(errno)); return -errno; } - hnd->base = intptr_t(mappedAddress) + hnd->offset; + hnd->base = uintptr_t(mappedAddress) + hnd->offset; //ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", // hnd->fd, hnd->offset, hnd->size, mappedAddress); } @@ -64,7 +64,7 @@ static int gralloc_map(gralloc_module_t const* module, return 0; } -static int gralloc_unmap(gralloc_module_t const* module, +static int gralloc_unmap(gralloc_module_t const* /*module*/, buffer_handle_t handle) { private_handle_t* hnd = (private_handle_t*)handle; @@ -163,9 +163,9 @@ int terminateBuffer(gralloc_module_t const* module, return 0; } -int gralloc_lock(gralloc_module_t const* module, - buffer_handle_t handle, int usage, - int l, int t, int w, int h, +int gralloc_lock(gralloc_module_t const* /*module*/, + buffer_handle_t handle, int /*usage*/, + int /*l*/, int /*t*/, int /*w*/, int /*h*/, void** vaddr) { // this is called when a buffer is being locked for software @@ -184,7 +184,7 @@ int gralloc_lock(gralloc_module_t const* module, return 0; } -int gralloc_unlock(gralloc_module_t const* module, +int gralloc_unlock(gralloc_module_t const* /*module*/, buffer_handle_t handle) { // we're done with a software buffer. nothing to do in this |