diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-04-09 19:31:56 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-04-09 19:31:56 +0000 |
| commit | 80a77eb7c54fcb44f04621ea71a30027fb1da8ba (patch) | |
| tree | 32b0e46441eb46a3113f53cdb7476677817b2aa0 /lib/libedit/hist.h | |
| parent | 09d2092d537bbc1ca76871a1c7633a4c15c15705 (diff) | |
Always compile with WIDECHAR on and delete that preprocessor switch.
OK martijn@.
Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
Diffstat (limited to 'lib/libedit/hist.h')
| -rw-r--r-- | lib/libedit/hist.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h index dc4eb0ae4c8..cb3a81c309b 100644 --- a/lib/libedit/hist.h +++ b/lib/libedit/hist.h @@ -1,5 +1,5 @@ -/* $OpenBSD: hist.h,v 1.12 2016/03/20 23:48:27 schwarze Exp $ */ -/* $NetBSD: hist.h,v 1.18 2016/02/17 19:47:49 christos Exp $ */ +/* $OpenBSD: hist.h,v 1.13 2016/04/09 19:31:55 schwarze Exp $ */ +/* $NetBSD: hist.h,v 1.19 2016/03/23 22:27:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -56,14 +56,9 @@ typedef struct el_history_t { #define HIST_FUN_INTERNAL(el, fn, arg) \ ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \ fn, arg)) == -1) ? NULL : (el)->el_history.ev.str) -#ifdef WIDECHAR #define HIST_FUN(el, fn, arg) \ (((el)->el_flags & NARROW_HISTORY) ? hist_convert(el, fn, arg) : \ HIST_FUN_INTERNAL(el, fn, arg)) -#else -#define HIST_FUN(el, fn, arg) HIST_FUN_INTERNAL(el, fn, arg) -#endif - #define HIST_NEXT(el) HIST_FUN(el, H_NEXT, NULL) #define HIST_FIRST(el) HIST_FUN(el, H_FIRST, NULL) @@ -80,8 +75,6 @@ protected el_action_t hist_get(EditLine *); protected int hist_set(EditLine *, hist_fun_t, void *); protected int hist_command(EditLine *, int, const Char **); protected int hist_enlargebuf(EditLine *, size_t, size_t); -#ifdef WIDECHAR protected wchar_t *hist_convert(EditLine *, int, void *); -#endif #endif /* _h_el_hist */ |