merge-file: handle freopen() failure

diff --git a/utf8.h b/utf8.h
index 4a7f0464c4321864f96eb9ce96eaccfead3ad935..98cce1b038a908bec51ccd2f7e1c1f648cb429a1 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -3,8 +3,8 @@
 
 typedef unsigned int ucs_char_t;  /* assuming 32bit int */
 
-ucs_char_t pick_one_utf8_char(const char **start);
-int utf8_width(const char **start);
+ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p);
+int utf8_width(const char **start, size_t *remainder_p);
 int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);