diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-14 16:52:38 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-14 16:52:38 -0700 |
| commit | f52268db1add49377ff10c7bdf8a21878372fc3c (patch) | |
| tree | 26b74c30c89d2bda05fe07e544b64d5077645871 /ports/libiconv/0002-Config-for-MSVC.patch | |
| parent | eb1cea1f4396677317eda5c8163203aff3054776 (diff) | |
| parent | 9517eeadbba6e0f491a2961cd359c4c4892ef93f (diff) | |
| download | vcpkg-f52268db1add49377ff10c7bdf8a21878372fc3c.tar.gz vcpkg-f52268db1add49377ff10c7bdf8a21878372fc3c.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/libiconv/0002-Config-for-MSVC.patch')
| -rw-r--r-- | ports/libiconv/0002-Config-for-MSVC.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/ports/libiconv/0002-Config-for-MSVC.patch b/ports/libiconv/0002-Config-for-MSVC.patch new file mode 100644 index 000000000..8ce2f683f --- /dev/null +++ b/ports/libiconv/0002-Config-for-MSVC.patch @@ -0,0 +1,68 @@ +diff --git "a/config.h.in" "b/config.h.in" +index 207e487..56501ed 100644 +--- "a/config.h.in" ++++ "b/config.h.in" +@@ -27,7 +27,7 @@ + #undef DOUBLE_SLASH_IS_DISTINCT_ROOT + + /* Define as good substitute value for EILSEQ. */ +-#undef EILSEQ ++//#undef EILSEQ + + /* Define to 1 to enable a few rarely used encodings. */ + #undef ENABLE_EXTRA +@@ -207,10 +207,10 @@ + #undef HAVE_MACH_O_DYLD_H + + /* Define to 1 if you have the `mbrtowc' function. */ +-#undef HAVE_MBRTOWC ++#define HAVE_MBRTOWC 1 + + /* Define to 1 if you have the `mbsinit' function. */ +-#undef HAVE_MBSINIT ++#define HAVE_MBSINIT 1 + + /* Define to 1 if <wchar.h> declares mbstate_t. */ + #undef HAVE_MBSTATE_T +@@ -665,7 +665,7 @@ + #undef HAVE_WCHAR_T + + /* Define to 1 if you have the `wcrtomb' function. */ +-#undef HAVE_WCRTOMB ++#define HAVE_WCRTOMB 1 + + /* Define to 1 if you have the <winsock2.h> header file. */ + #undef HAVE_WINSOCK2_H +@@ -683,7 +683,7 @@ + #undef HAVE__NSGETEXECUTABLEPATH + + /* Define as const if the declaration of iconv() needs const. */ +-#undef ICONV_CONST ++#define ICONV_CONST const + + /* Define to the value of ${prefix}, as a string. */ + #undef INSTALLPREFIX +@@ -787,7 +787,7 @@ + #undef WINT_T_SUFFIX + + /* Define if the machine's byte ordering is little endian. */ +-#undef WORDS_LITTLEENDIAN ++#define WORDS_LITTLEENDIAN 1 + + /* Define to 1 if on MINIX. */ + #undef _MINIX + +diff --git "a/lib/loop_wchar.h" "b/lib/loop_wchar.h" +index 6dc011b..158ccdd 100644 +--- "a/lib/loop_wchar.h" ++++ "b/lib/loop_wchar.h" +@@ -37,7 +37,7 @@ + # include <wchar.h> + # define BUF_SIZE 64 /* assume MB_LEN_MAX <= 64 */ + /* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ +- extern size_t mbrtowc (); ++// extern size_t mbrtowc (); + # ifdef mbstate_t + # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) + # define mbsinit(ps) 1 +
\ No newline at end of file |