From f634683d9da0a3d53c33815a1c4044b7655b084a Mon Sep 17 00:00:00 2001 From: wangwenjun Date: Thu, 19 Jun 2025 09:46:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=85=85@since=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/musl/ndk_musl_include/malloc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/third_party/musl/ndk_musl_include/malloc.h b/third_party/musl/ndk_musl_include/malloc.h index 70cf26b70..156aece76 100644 --- a/third_party/musl/ndk_musl_include/malloc.h +++ b/third_party/musl/ndk_musl_include/malloc.h @@ -75,6 +75,7 @@ int mallopt(int param, int value); * @return 1 - The memory block was allocated using Standard C library Memory Allocator. * 0 - The memory block was not allocated using Standard C library Memory Allocator. * -1 - The function is not implemented or other error. + * @since 19 */ int malloc_check_from_ptr(void *ptr); -- Gitee From 133c4428e587e366677156266e91069896bbda5e Mon Sep 17 00:00:00 2001 From: wangwenjun Date: Thu, 19 Jun 2025 03:21:26 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E8=A1=A5=E5=85=85@since=E6=A0=87?= =?UTF-8?q?=E7=AD=BE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f634683d9da0a3d53c33815a1c4044b7655b084a. --- third_party/musl/ndk_musl_include/malloc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/third_party/musl/ndk_musl_include/malloc.h b/third_party/musl/ndk_musl_include/malloc.h index 156aece76..70cf26b70 100644 --- a/third_party/musl/ndk_musl_include/malloc.h +++ b/third_party/musl/ndk_musl_include/malloc.h @@ -75,7 +75,6 @@ int mallopt(int param, int value); * @return 1 - The memory block was allocated using Standard C library Memory Allocator. * 0 - The memory block was not allocated using Standard C library Memory Allocator. * -1 - The function is not implemented or other error. - * @since 19 */ int malloc_check_from_ptr(void *ptr); -- Gitee