diff options
Diffstat (limited to 'print/tex-xdvik/files/patch-texk-xdvik-encodings.c')
| -rw-r--r-- | print/tex-xdvik/files/patch-texk-xdvik-encodings.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-encodings.c b/print/tex-xdvik/files/patch-texk-xdvik-encodings.c index fe5d0026080d..48b8761f5cd9 100644 --- a/print/tex-xdvik/files/patch-texk-xdvik-encodings.c +++ b/print/tex-xdvik/files/patch-texk-xdvik-encodings.c @@ -1,6 +1,6 @@ ---- texk/xdvik/encodings.c.orig 2014-09-02 18:41:34.000000000 +0900 -+++ texk/xdvik/encodings.c 2015-01-31 21:02:18.000000000 +0900 -@@ -69,10 +69,18 @@ +--- texk/xdvik/encodings.c.orig 2013-03-31 05:28:20 UTC ++++ texk/xdvik/encodings.c +@@ -69,10 +69,18 @@ OTHER DEALINGS IN THE SOFTWARE. #if HAVE_ICONV_H # include <iconv.h> static iconv_t m_iconv_gb_ucs4 = (iconv_t)(-1); @@ -19,7 +19,7 @@ #include "util.h" #include "encodings.h" #include "my-snprintf.h" -@@ -3021,9 +3029,75 @@ +@@ -3021,8 +3029,74 @@ close_iconv(void *dummy) iconv_close(m_iconv_gb_ucs4); m_iconv_gb_ucs4 = (iconv_t)(-1); } @@ -27,9 +27,9 @@ + iconv_close(m_iconv_jis_ucs4); + m_iconv_jis_ucs4 = (iconv_t)(-1); + } - #endif /* HAVE_ICONV_H */ - } - ++#endif /* HAVE_ICONV_H */ ++} ++ +#ifdef PTEX +/* convert a JIS char to unicode (UCS-4) using iconv() */ +uint32_t @@ -88,14 +88,13 @@ + warned = True; + } + return 0; -+#endif /* HAVE_ICONV_H */ -+} + #endif /* HAVE_ICONV_H */ + } +#endif /* PTEX */ -+ + /* convert a CJK char to unicode (UCS-4) using iconv() */ static uint32_t - cjk2unicode(unsigned char *cjk) -@@ -3577,6 +3651,24 @@ +@@ -3577,6 +3651,24 @@ guess_encoding(wide_ubyte ch, const char TRACE_FIND_VERBOSE((stderr, "guess_encoding: |%s|, char 0x%.4X", fontname, ch)); |