RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 15:34:31 +00:00
Code Issues Releases Wiki Activity

stream_libarchive: Always use LC_CTYPE_MASK for libarchive

Browse Source 
Using LC_ALL_MASK is unnecessary and unreliable on some systems.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
This commit is contained in:
James Hilliard 2019-05-04 18:25:17 +02:00 committed by wm4
parent 4c4d7a64c6
commit abfc58cad4
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osdep/io.h
View File

@ -193,7 +193,6 @@ int msync(void *addr, size_t length, int flags);
// These are stubs since there is not anything that helps with this on Windows. // These are stubs since there is not anything that helps with this on Windows.
#define locale_t int #define locale_t int
#define LC_ALL_MASK 0
#define LC_CTYPE_MASK 0 #define LC_CTYPE_MASK 0
locale_t newlocale(int, const char *, locale_t); locale_t newlocale(int, const char *, locale_t);
locale_t uselocale(locale_t); locale_t uselocale(locale_t);

2
stream/stream_libarchive.c
View File

@ -243,7 +243,7 @@ struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src,
{ {
struct mp_archive *mpa = talloc_zero(NULL, struct mp_archive); struct mp_archive *mpa = talloc_zero(NULL, struct mp_archive);
mpa->log = log; mpa->log = log;
mpa->locale = newlocale(LC_ALL_MASK, "C.UTF-8", (locale_t)0); mpa->locale = newlocale(LC_CTYPE_MASK, "C.UTF-8", (locale_t)0);
if (!mpa->locale) { if (!mpa->locale) {
mpa->locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0); mpa->locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0);
if (!mpa->locale) if (!mpa->locale)