From 2b7a923bb75a901e92c832e3ad2e864c44bb4d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=87=E7=8E=89=E5=8A=A0?= Date: Thu, 25 Apr 2024 17:58:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0fopencookie=E5=92=8Crenam?= =?UTF-8?q?eat2=E5=87=BD=E6=95=B0=E6=8E=A5=E5=8F=A3=E6=9A=B4=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/musl/ndk_musl_include/stdio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/musl/ndk_musl_include/stdio.h b/third_party/musl/ndk_musl_include/stdio.h index e71ae4f8f49..31e9ca11bbc 100644 --- a/third_party/musl/ndk_musl_include/stdio.h +++ b/third_party/musl/ndk_musl_include/stdio.h @@ -153,6 +153,7 @@ int putchar_unlocked(int); ssize_t getdelim(char **__restrict, size_t *__restrict, int, FILE *__restrict); ssize_t getline(char **__restrict, size_t *__restrict, FILE *__restrict); int renameat(int, const char *, int, const char *); +int renameat2(int, const char *, int, const char *, unsigned int); char *ctermid(char *); #define L_ctermid 20 #endif @@ -198,7 +199,7 @@ typedef struct _IO_cookie_io_functions_t { cookie_seek_function_t *seek; cookie_close_function_t *close; } cookie_io_functions_t; - +FILE *fopencookie(void *, const char *, cookie_io_functions_t); #endif #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) -- Gitee From 04979d976a6a1b1728e6cc80dd5e6975ac67f1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=87=E7=8E=89=E5=8A=A0?= Date: Thu, 25 Apr 2024 10:12:25 +0000 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0fopencookie?= =?UTF-8?q?=E5=92=8Crenameat2=E5=87=BD=E6=95=B0=E6=8E=A5=E5=8F=A3=E6=9A=B4?= =?UTF-8?q?=E9=9C=B2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2b7a923bb75a901e92c832e3ad2e864c44bb4d17. --- third_party/musl/ndk_musl_include/stdio.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/musl/ndk_musl_include/stdio.h b/third_party/musl/ndk_musl_include/stdio.h index 31e9ca11bbc..e71ae4f8f49 100644 --- a/third_party/musl/ndk_musl_include/stdio.h +++ b/third_party/musl/ndk_musl_include/stdio.h @@ -153,7 +153,6 @@ int putchar_unlocked(int); ssize_t getdelim(char **__restrict, size_t *__restrict, int, FILE *__restrict); ssize_t getline(char **__restrict, size_t *__restrict, FILE *__restrict); int renameat(int, const char *, int, const char *); -int renameat2(int, const char *, int, const char *, unsigned int); char *ctermid(char *); #define L_ctermid 20 #endif @@ -199,7 +198,7 @@ typedef struct _IO_cookie_io_functions_t { cookie_seek_function_t *seek; cookie_close_function_t *close; } cookie_io_functions_t; -FILE *fopencookie(void *, const char *, cookie_io_functions_t); + #endif #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) -- Gitee From d012a6a878c4e93bc813e2b381b8d8e5efa1fa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=87=E7=8E=89=E5=8A=A0?= Date: Mon, 13 May 2024 10:06:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4NDK=20MUSL=E9=87=8C=5F=5F?= =?UTF-8?q?assert=5Ffail=E5=87=BD=E6=95=B0=E4=B8=8A=E7=9A=84=5FNoreturn?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ไป‡็Ž‰ๅŠ  --- third_party/musl/ndk_musl_include/assert.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/musl/ndk_musl_include/assert.h b/third_party/musl/ndk_musl_include/assert.h index ff157304046..3e72eb3c031 100644 --- a/third_party/musl/ndk_musl_include/assert.h +++ b/third_party/musl/ndk_musl_include/assert.h @@ -16,7 +16,7 @@ extern "C" { #endif -_Noreturn void __assert_fail (const char *, const char *, int, const char *); +void __assert_fail (const char *, const char *, int, const char *); #ifdef __cplusplus } -- Gitee