From b9a153ac4e4690112877e4817b840ebdc7427c5a Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 9 Oct 2011 22:06:39 -0700 Subject: Following up to previous commit's TODO. * filter.c (struct filter_par): wchar_t becomes wchli_t. * lib.h (wchli_t): New type: an incomplete structure type, so that a pointer to this type is incompatible with anything else. (wli): Macro produces const wchli_t * pointer instead of const wchar_t *. (auto_str, static_str): Accept a const wchli_t * instead of const wchar_t *, making it impossible to misuse these functions by passing in a literal. * stream.c (string_out_put_char): These type changes showed this hack to have a bug. Confronted with the need to cast from const wchar_t * to const wchli_t *, it's obvious that the conversion has to be done properly with the + 1 in the one platform case, but not the other. * txr.c (version): Type changed to const wchli_t. * txr.h (version): Declaration updated. --- txr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'txr.h') diff --git a/txr.h b/txr.h index e8e12a67..1b0f23f7 100644 --- a/txr.h +++ b/txr.h @@ -32,6 +32,6 @@ extern int opt_gc_debug; extern int opt_vg_debug; #endif extern int opt_derivative_regex; -extern const wchar_t *version; +extern const wchli_t *version; extern const wchar_t *progname; extern int output_produced; -- cgit v1.2.3