From 54b2f89a01a25062ae5693736b5a803698d775a2 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 9 Nov 2022 21:54:27 +0100 Subject: [PATCH] ndk-patches: remove langinfo.h.patch It is overwritten by the header we carry in ndk-patches/ in termux_setup_toolchain_xx() anyways. --- ndk-patches/23c/langinfo.h.patch | 108 ------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 ndk-patches/23c/langinfo.h.patch diff --git a/ndk-patches/23c/langinfo.h.patch b/ndk-patches/23c/langinfo.h.patch deleted file mode 100644 index 14d8a1b9c8..0000000000 --- a/ndk-patches/23c/langinfo.h.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -N -a -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/langinfo.h ./usr/include/langinfo.h ---- /home/fornwall/lib/android-ndk/sysroot/usr/include/langinfo.h 2017-11-09 09:57:12.000000000 +0100 -+++ ./usr/include/langinfo.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,104 +0,0 @@ --/* -- * Copyright (C) 2016 The Android Open Source Project -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * * Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * * Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in -- * the documentation and/or other materials provided with the -- * distribution. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- */ -- --#ifndef _LANGINFO_H_ --#define _LANGINFO_H_ -- --#include -- --#include --#include -- --__BEGIN_DECLS -- --#define CODESET 1 --#define D_T_FMT 2 --#define D_FMT 3 --#define T_FMT 4 --#define T_FMT_AMPM 5 --#define AM_STR 6 --#define PM_STR 7 --#define DAY_1 8 --#define DAY_2 9 --#define DAY_3 10 --#define DAY_4 11 --#define DAY_5 12 --#define DAY_6 13 --#define DAY_7 14 --#define ABDAY_1 15 --#define ABDAY_2 16 --#define ABDAY_3 17 --#define ABDAY_4 18 --#define ABDAY_5 19 --#define ABDAY_6 20 --#define ABDAY_7 21 --#define MON_1 22 --#define MON_2 23 --#define MON_3 24 --#define MON_4 25 --#define MON_5 26 --#define MON_6 27 --#define MON_7 28 --#define MON_8 29 --#define MON_9 30 --#define MON_10 31 --#define MON_11 32 --#define MON_12 33 --#define ABMON_1 34 --#define ABMON_2 35 --#define ABMON_3 36 --#define ABMON_4 37 --#define ABMON_5 38 --#define ABMON_6 39 --#define ABMON_7 40 --#define ABMON_8 41 --#define ABMON_9 42 --#define ABMON_10 43 --#define ABMON_11 44 --#define ABMON_12 45 --#define ERA 46 --#define ERA_D_FMT 47 --#define ERA_D_T_FMT 48 --#define ERA_T_FMT 49 --#define ALT_DIGITS 50 --#define RADIXCHAR 51 --#define THOUSEP 52 --#define YESEXPR 53 --#define NOEXPR 54 --#define CRNCYSTR 55 -- -- --#if __ANDROID_API__ >= 26 --char* nl_langinfo(nl_item __item) __INTRODUCED_IN(26); --char* nl_langinfo_l(nl_item __item, locale_t __l) __INTRODUCED_IN(26); --#endif /* __ANDROID_API__ >= 26 */ -- -- --__END_DECLS -- --#endif