From 543471921f6ba439bc7ce3cd03edbe538dcb34d7 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 28 Apr 2025 09:49:39 -0400 Subject: lib: Fix build on newer Android NDK - Temporarily remove __counted_by definition. Signed-off-by: Andrew Opalach --- include/al/lib.h | 2 +- include/al/macros.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/al/lib.h b/include/al/lib.h index cb5101a..60960cc 100644 --- a/include/al/lib.h +++ b/include/al/lib.h @@ -1,8 +1,8 @@ #ifndef _AL_LIB_H #define _AL_LIB_H -#include "types.h" #include "macros.h" +#include "types.h" // Piggyback off c89atomic for pointer size macros. #include diff --git a/include/al/macros.h b/include/al/macros.h index 3932c37..0f116dc 100644 --- a/include/al/macros.h +++ b/include/al/macros.h @@ -74,7 +74,8 @@ #define GB(n) ((n) << 30) #define TB(n) (((u64)n) << 40) -#if defined __counted_by || defined __sized_by +//#if defined __counted_by || defined __sized_by +#if defined __sized_by #error "Conflicting definitions for common attributes" #endif @@ -85,11 +86,11 @@ #define AL_HAS_ATTRIBUTE(x) 0 #endif -#if AL_HAS_ATTRIBUTE(__counted_by__) -#define __counted_by(member) __attribute__((__counted_by__(member))) -#else -#define __counted_by(member) -#endif +//#if AL_HAS_ATTRIBUTE(__counted_by__) +//#define __counted_by(member) __attribute__((__counted_by__(member))) +//#else +//#define __counted_by(member) +//#endif #if AL_HAS_ATTRIBUTE(__sized_by__) #define __sized_by(member) __attribute__((__sized_by__(member))) -- cgit v1.2.3-101-g0448