OSDN Git Service

libdrm: gralloc_handle.h: Fix build issue with Android
authorJohn Stultz <john.stultz@linaro.org>
Tue, 3 Apr 2018 03:37:33 +0000 (20:37 -0700)
committerRobert Foss <robert.foss@collabora.com>
Tue, 3 Apr 2018 08:19:21 +0000 (10:19 +0200)
commit35affe89d5f617a972b1cfee00c51cbe9e7c64a2
treeaca642a9a3089454cafdb1dd377b3e900959651a
parent8ec043ecead3aacc017464d5eb133618909f723d
libdrm: gralloc_handle.h: Fix build issue with Android

In trying to integrate the new gralloc_handle.h with the
drm_hwcomposer, I started seeing the following compilation
errors:

In file included from external/drm_hwcomposer/platformdrmgeneric.cpp:28:
external/libdrm/android/gralloc_handle.h:108:9: error: cannot initialize return object of type 'native_handle_t *' (aka 'native_handle *') with an lvalue of type 'struct gralloc_handle_t *'
        return handle;
               ^~~~~~
1 error generated.

This seems to be due to the gralloc_handle_create() definition
needs to return a native_handle_t * type, rather then a
gralloc_handle_t *, which is what the code actually returns.

After talking w/ Rob Herring, having the code return the
native handle should be the proper fix, so that is what
this patch changes.

Cc: Chih-Wei Huang <cwhuang@android-x86.org>
Cc: Stefan Schake <stschake@gmail.com>
Cc: Robert Foss <robert.foss@collabora.com>
Cc: Sean Paul <seanpaul@google.com>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Reviewed-by: Robert Foss <robert.foss@collabora.com>
android/gralloc_handle.h