From 6d7ccf67b3c08982ccafe9445f449c9fc17ad08b Mon Sep 17 00:00:00 2001 From: Gautham Date: Sun, 15 Oct 2023 17:22:59 -0500 Subject: [PATCH] fix includes and license --- third_party/musl/hsearch.c | 5 ++--- third_party/musl/insque.c | 2 +- third_party/musl/lsearch.c | 4 ++-- third_party/musl/tdelete.c | 4 ++-- third_party/musl/tdestroy.c | 5 ++--- third_party/musl/tfind.c | 2 +- third_party/musl/tsearch.c | 6 +++--- third_party/musl/twalk.c | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/third_party/musl/hsearch.c b/third_party/musl/hsearch.c index 358ac643b..6c5a4826b 100644 --- a/third_party/musl/hsearch.c +++ b/third_party/musl/hsearch.c @@ -25,14 +25,13 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/mem/mem.h" #define _GNU_SOURCE -#include "libc/isystem/stdlib.h" -#include "libc/isystem/string.h" #include "third_party/musl/search.h" asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/insque.c b/third_party/musl/insque.c index 87f4f3726..1d91fe3c9 100644 --- a/third_party/musl/insque.c +++ b/third_party/musl/insque.c @@ -29,7 +29,7 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/lsearch.c b/third_party/musl/lsearch.c index 15df4b17a..710264324 100644 --- a/third_party/musl/lsearch.c +++ b/third_party/musl/lsearch.c @@ -25,12 +25,12 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/isystem/string.h" +#include "libc/mem/mem.h" #include "third_party/musl/search.h" asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/tdelete.c b/third_party/musl/tdelete.c index edaf73737..731d94fb7 100644 --- a/third_party/musl/tdelete.c +++ b/third_party/musl/tdelete.c @@ -25,13 +25,13 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/isystem/stdlib.h" +#include "libc/mem/mem.h" #include "third_party/musl/search.h" #include "third_party/musl/tsearch.h" asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/tdestroy.c b/third_party/musl/tdestroy.c index bc87d9f4e..ff2baca89 100644 --- a/third_party/musl/tdestroy.c +++ b/third_party/musl/tdestroy.c @@ -25,15 +25,14 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/mem/mem.h" #define _GNU_SOURCE -#include "libc/isystem/stdlib.h" -#include "libc/isystem/string.h" #include "third_party/musl/search.h" #include "third_party/musl/tsearch.h" asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/tfind.c b/third_party/musl/tfind.c index 322e7db75..166a47131 100644 --- a/third_party/musl/tfind.c +++ b/third_party/musl/tfind.c @@ -30,7 +30,7 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/tsearch.c b/third_party/musl/tsearch.c index 2f97436ed..0b932e93d 100644 --- a/third_party/musl/tsearch.c +++ b/third_party/musl/tsearch.c @@ -25,14 +25,14 @@ │ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │ │ │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/isystem/stdlib.h" -#include "libc/isystem/string.h" +#include "libc/mem/mem.h" +#include "libc/str/str.h" #include "third_party/musl/search.h" #include "third_party/musl/tsearch.h" asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off diff --git a/third_party/musl/twalk.c b/third_party/musl/twalk.c index 24f780e99..b36591bb6 100644 --- a/third_party/musl/twalk.c +++ b/third_party/musl/twalk.c @@ -30,7 +30,7 @@ asm(".ident\t\"\\n\\n\ Musl libc (MIT License)\\n\ -Copyright 2005-2014 Rich Felker, et. al.\""); +Copyright 2005-2020 Rich Felker, et. al.\""); asm(".include \"libc/disclaimer.inc\""); // clang-format off