Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a5f00be authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Include <assert.h> for static_assert in C11." am: 67106b6d am: 143356c7 

am: 0ae1a57e

Change-Id: I06c3ce22d5c5f8daf65ce8373b7341fb67885b10
parents 52022aaf 0ae1a57e

media/ndk/include/media/NdkMediaCodec.h

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ ssize_t AMediaCodec_dequeueInputBuffer(AMediaCodec*, int64_t timeoutUs); 


#if (defined(__cplusplus) && __cplusplus >= 201103L) || \

    __STDC_VERSION__ >= 201112L

#include <assert.h>

static_assert(sizeof(_off_t_compat) == sizeof(long),

              "_off_t_compat does not match the NDK ABI. See "

              "https://github.com/android-ndk/ndk/issues/459.");