diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/libiconv/0002-Config-for-MSVC.patch | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/libiconv/0002-Config-for-MSVC.patch')
| -rw-r--r-- | ports/libiconv/0002-Config-for-MSVC.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/ports/libiconv/0002-Config-for-MSVC.patch b/ports/libiconv/0002-Config-for-MSVC.patch index 8ce2f683f..0c90e50ef 100644 --- a/ports/libiconv/0002-Config-for-MSVC.patch +++ b/ports/libiconv/0002-Config-for-MSVC.patch @@ -1,57 +1,3 @@ -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" |