diff options
author | Elliott Hughes <enh@google.com> | 2016-03-26 10:54:23 -0700 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2016-03-29 18:59:31 -0500 |
commit | 9fcaca8434ece1afcc9982c18a86cf12ac9af508 (patch) | |
tree | ae9eced4bf8e76c137f3d21d8d17cbda1cf1eca9 | |
parent | 0e05569e308f927cd84882f7463739681bf1a33b (diff) | |
download | toybox-9fcaca8434ece1afcc9982c18a86cf12ac9af508.tar.gz |
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...
-rw-r--r-- | lib/lib.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |