From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 16 Apr 2011 03:43:08 +0000 (-0400)
Subject: Fix build error on POSIX platform.
X-Git-Tag: v3.0.0a~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a0feebfe299ceec64ee05b3c7862bbde394b0fc;p=thirdparty%2Flibarchive.git

Fix build error on POSIX platform.

SVN-Revision: 3241
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index bc5f37434..18be7fc92 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -692,15 +692,19 @@ create_sconv_object(const char *fc, const char *tc,
 			flag |= SCONV_UTF16BE;
 		sc->from_cp = current_codepage;
 		sc->to_cp = make_codepage_from_charset(tc);
+#if defined(_WIN32) && !defined(__CYGWIN__)
 		if (IsValidCodePage(sc->to_cp))
 			flag |= SCONV_WIN_CP;
+#endif
 	} else if (flag & SCONV_FROM_CHARSET) {
 		if (strcmp(fc, "UTF-16BE") == 0)
 			flag |= SCONV_UTF16BE;
 		sc->to_cp = current_codepage;
 		sc->from_cp = make_codepage_from_charset(fc);
+#if defined(_WIN32) && !defined(__CYGWIN__)
 		if (IsValidCodePage(sc->from_cp))
 			flag |= SCONV_WIN_CP;
+#endif
 	}
 	sc->flag = flag;