Use the more advanced iconv.m4 script from ELinks

[tig] / tig.c

diff --git a/tig.c b/tig.c
index 51d0feeede36eab21d5d6d9af597fc8693fd5dbc..0390b3a00276a2ce4060daf9bd323aedd45e6f04 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -80,9 +80,6 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 #define COLOR_DEFAULT  (-1)
 
 #define ICONV_NONE     ((iconv_t) -1)
 #define COLOR_DEFAULT  (-1)
 
 #define ICONV_NONE     ((iconv_t) -1)

-#ifndef ICONV_INBUF_TYPE
-#define ICONV_INBUF_TYPE char *
-#endif

 
 /* The format and size of the date column in the main view. */
 #define DATE_FORMAT    "%Y-%m-%d %H:%M"
 
 /* The format and size of the date column in the main view. */
 #define DATE_FORMAT    "%Y-%m-%d %H:%M"


@@ -1943,7 +1940,7 @@ update_view(struct view *view)
                        line[linelen - 1] = 0;
 
                if (opt_iconv != ICONV_NONE) {
                        line[linelen - 1] = 0;
 
                if (opt_iconv != ICONV_NONE) {

-                       ICONV_INBUF_TYPE inbuf = line;
+                       ICONV_CONST char *inbuf = line;

                        size_t inlen = linelen;
 
                        char *outbuf = out_buffer;
                        size_t inlen = linelen;
 
                        char *outbuf = out_buffer;