ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsync: ndk: Fix compilation in C mode." into oc-dev

Browse source 
am: fb803d50d0

Change-Id: Ifd281185c536fc00552ee8e9a47ca8290373ef95
This commit is contained in:
Alistair Strachan 2017-04-15 00:14:32 +00:00 • committed by android-build-merger
commit 409db49df8
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libsync/include/ndk/sync.h
View file

@ -69,8 +69,7 @@ struct sync_file_info *sync_file_info(int32_t fd);
* The returned array is owned by the parent sync file info, and has
* info->num_fences entries.
*/
inline struct sync_fence_info *sync_get_fence_info(
const struct sync_file_info *info) {
static inline struct sync_fence_info* sync_get_fence_info(const struct sync_file_info* info) {
// This header should compile in C, but some C++ projects enable
// warnings-as-error for C-style casts.
#pragma GCC diagnostic push