diff options
Diffstat (limited to 'editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp')
| -rw-r--r-- | editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp index 634dbfd9c8e3..fbbca1b6ce8f 100644 --- a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp +++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp @@ -1,19 +1,6 @@ ---- src/af/util/xp/ut_iconv.cpp.orig 2008-04-04 09:41:47.000000000 -0500 -+++ src/af/util/xp/ut_iconv.cpp 2008-04-04 09:43:43.000000000 -0500 -@@ -230,10 +230,10 @@ - // we special-case the win32 build, otherwise spelling and other stuff - // just doesn't work - return "UCS-2LE"; --#elif defined(_LIBICONV_H) -+#elif defined(_LIBICONV_H) || defined(__FreeBSD__) - // libiconv seems to prefer UCS-2-INTERNAL to UCS-2BE and UCS-2LE - return "UCS-2-INTERNAL"; --#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__) -+#elif defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__) - // we special case the BSDs since spelling just doesn't work - return "UCS2"; - #else -@@ -253,10 +253,10 @@ +--- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 02:52:27.000000000 +0200 ++++ src/af/util/xp/ut_iconv.cpp 2009-10-27 22:43:07.000000000 +0100 +@@ -264,10 +264,10 @@ const char * ucs4Internal () // we special-case the win32 build, otherwise spelling and other stuff // just doesn't work return "UCS-4LE"; |