diff options
author | mm <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
commit | 67a9f0832af3d50d6867adc0f71c9a10390f4bd3 (patch) | |
tree | ea9e0ff2a038ff253d22999a64e6a39cdbe6ac86 /libarchive/archive_string.c | |
parent | 2f6e434fe4c652da1969314fa57ae21936cec85d (diff) | |
download | FreeBSD-src-67a9f0832af3d50d6867adc0f71c9a10390f4bd3.zip FreeBSD-src-67a9f0832af3d50d6867adc0f71c9a10390f4bd3.tar.gz |
Update libarchive's dist to latest changes in release branch
Git branch: release
Git commit: c477edc817b4382a1d0b2ff8c7b619af13bd349e
Obtained from: https://github.com/libarchive/libarchive.git
Diffstat (limited to 'libarchive/archive_string.c')
-rw-r--r-- | libarchive/archive_string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c index 550d7e7..49ff108 100644 --- a/libarchive/archive_string.c +++ b/libarchive/archive_string.c @@ -1286,7 +1286,7 @@ create_sconv_object(const char *fc, const char *tc, * Check if "from charset" and "to charset" are the same. */ if (strcmp(fc, tc) == 0 || - (sc->from_cp != -1 && sc->from_cp == sc->to_cp)) + (sc->from_cp != (unsigned)-1 && sc->from_cp == sc->to_cp)) sc->same = 1; else sc->same = 0; |