From 115dcd50f2b4c1475730b1890bf1bfe532eda049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= Date: Sat, 6 Sep 2025 11:05:26 +0800 Subject: [PATCH] add NDK compilation warn macro definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李想 --- .../info/application_target_sdk_version.h | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/third_party/musl/ndk_musl_include/info/application_target_sdk_version.h b/third_party/musl/ndk_musl_include/info/application_target_sdk_version.h index 677b8522e60..6ab79400989 100644 --- a/third_party/musl/ndk_musl_include/info/application_target_sdk_version.h +++ b/third_party/musl/ndk_musl_include/info/application_target_sdk_version.h @@ -20,6 +20,27 @@ extern "C" { #endif +#define __DISTRIBUTEOS_VERSION(maj, min, patch) maj##min##patch // min必须是两位数字dd(如00,01), patch也必须是两位（如00,01） +#define __OH_VERSION(maj,min) maj##.##min +#define __INNER_CONCAT(a,b) a##.##b +#define __INNER_DEPRECATED(platform, version) __attribute__((__availability__(platform, deprecated=version))) +#define __INNER_OBSOLETED(platform, version) __attribute__((__availability__(platform, obsoleted=version))) +#define __INNER_AVAILABILITY(platform, version) __attribute__((__availability__(platform, introduced=version))) + +// version: ohos的版本号,17或者是17.1等，最多支持两位小数 +#define __OH_AVAILABILITY(version) __INNER_AVAILABILITY(ohos, version) +// 提供给distribute_os使用的版本号，dos_ver使用__DISTRIBUTEOS_VERSION(5, 00, 01)来定义；oh_ver使用__OH_VERSION(17, 0)来定义 +#define __DISTRIBUTEOS_AVAILABILITY(dos_ver, oh_ver) __INNER_AVAILABILITY(ohos, __INNER_CONCAT(oh_ver,dos_ver)) +// 指定废弃的ohos版本号 +#define __OH_DEPRECATED(version) __INNER_DEPRECATED(ohos, version) +// 指定废弃的hmos版本号 +#define __DISTRIBUTEOS_DEPRECATED(dos_ver, oh_ver) __INNER_DEPRECATED(ohos, __INNER_CONCAT(oh_ver,dos_ver)) +// 指定废弃的ohos版本号 +#define __OH_OBSOLETED(version) __INNER_OBSOLETED(ohos, version) +// 指定废弃的hmos版本 +#define __DISTRIBUTEOS_OBSOLETED(dos_ver, oh_ver) __INNER_OBSOLETED(ohos, __INNER_CONCAT(oh_ver,dos_ver)) +#define SINCE(api) __builtin_available(ohos api, *) + #define SDK_VERSION_FUTURE 9999 #define SDK_VERSION_7 7 #define SDK_VERSION_8 8 -- Gitee