From 9fcaca8434ece1afcc9982c18a86cf12ac9af508 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 26 Mar 2016 10:54:23 -0700 Subject: Fix build when wchar_t is unsigned. external/toybox/lib/linestack.c:84:5: error: conflicting types for 'crunch_str' int crunch_str(char **str, int width, FILE *out, char *escmore, ^ external/toybox/lib/lib.h:228:5: note: previous declaration is here int crunch_str(char **str, int width, FILE *out, char *escmore, ^ I'm not sure whether the interface was intended to be wchar_t or int, but switching to int is the smaller change... --- lib/lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/lib.h b/lib/lib.h index ef5b5979..52ddc28e 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -226,7 +226,7 @@ struct linestack *linestack_load(char *name); int crunch_escape(FILE *out, int cols, int wc); int crunch_rev_escape(FILE *out, int cols, int wc); int crunch_str(char **str, int width, FILE *out, char *escmore, - int (*escout)(FILE *out, int cols, wchar_t wc)); + int (*escout)(FILE *out, int cols, int wc)); int draw_str(char *start, int width); int utf8len(char *str); int utf8skip(char *str, int width); -- cgit v1.2.3