summaryrefslogtreecommitdiffstats
path: root/stream.h
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2009-11-11 08:54:21 -0800
committerKaz Kylheku <kaz@kylheku.com>2009-11-11 08:54:21 -0800
commitd59d8950ec58702821ec618b92dfb2490ae0bf31 (patch)
treee27e2914d563171ad56c2f7ae30c7c49343df06c /stream.h
parent2f62f352f603b837a5cf032c257531052530c410 (diff)
downloadtxr-d59d8950ec58702821ec618b92dfb2490ae0bf31.tar.gz
txr-d59d8950ec58702821ec618b92dfb2490ae0bf31.tar.bz2
txr-d59d8950ec58702821ec618b92dfb2490ae0bf31.zip
Big conversion to wide characters and UTF-8 support.
This is incomplete. There are too many dependencies on wide character support from the C stream I/O library, and implicit use of some encoding which may not be UTF-8. The regex code does not handle wide characters properly. Character type is still int in some places, rather than wchar_t. Test suite passes though.
Diffstat (limited to 'stream.h')
-rw-r--r--stream.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream.h b/stream.h
index ba483b27..78f83f93 100644
--- a/stream.h
+++ b/stream.h
@@ -35,13 +35,13 @@ obj_t *make_dir_stream(DIR *);
obj_t *close_stream(obj_t *stream, obj_t *throw_on_error);
obj_t *get_line(obj_t *);
obj_t *get_char(obj_t *);
-obj_t *vformat(obj_t *stream, const char *string, va_list); /* nao-terminated */
+obj_t *vformat(obj_t *stream, const wchar_t *string, va_list); /* nao-term */
obj_t *vcformat(obj_t *stream, const char *string, va_list); /* printf-style */
-obj_t *format(obj_t *stream, const char *string, ...);
+obj_t *format(obj_t *stream, const wchar_t *string, ...);
obj_t *cformat(obj_t *stream, const char *string, ...);
obj_t *put_string(obj_t *stream, obj_t *string);
obj_t *put_line(obj_t *stream, obj_t *string);
-obj_t *put_cstring(obj_t *stream, const char *);
+obj_t *put_cstring(obj_t *stream, const wchar_t *);
obj_t *put_char(obj_t *stream, obj_t *ch);
obj_t *put_cchar(obj_t *stream, int ch);