diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-09-11 09:41:44 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-11 09:41:44 +0300 |
| commit | 963b00043c4d3fa933ed0c3c5d909ac3bb5d0421 (patch) | |
| tree | 79a27e7456e94f5d92abb1118420850c886df1d8 /main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch | |
| parent | 333a16d94df1eddca2b81ea51868a91128505509 (diff) | |
| download | aports-963b00043c4d3fa933ed0c3c5d909ac3bb5d0421.tar.bz2 aports-963b00043c4d3fa933ed0c3c5d909ac3bb5d0421.tar.xz | |
main/musl: cherry-pick upstream fixes
make previous commits the upstream versions, and add few
additional fixes
Diffstat (limited to 'main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch')
| -rw-r--r-- | main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch b/main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch new file mode 100644 index 0000000000..bd815159b6 --- /dev/null +++ b/main/musl/0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch @@ -0,0 +1,25 @@ +From 58f6259dff804faa416df4f9b1ca2fc61d178585 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Wed, 9 Sep 2015 06:04:42 +0000 +Subject: [PATCH] fix breakage in nl_langinfo from previous commit + +--- + src/locale/langinfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c +index 69693ff..a1ada24 100644 +--- a/src/locale/langinfo.c ++++ b/src/locale/langinfo.c +@@ -33,7 +33,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc) + int idx = item & 65535; + const char *str; + +- if (item == CODESET) "UTF-8"; ++ if (item == CODESET) return "UTF-8"; + + switch (cat) { + case LC_NUMERIC: +-- +2.5.1 + |