diff options
| author | pfg <pfg@FreeBSD.org> | 2017-02-20 03:33:59 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2017-02-20 03:33:59 +0000 |
| commit | 90692e8243d9334f92182299ee401dc0a90965e2 (patch) | |
| tree | d5cbabb64df66f2169ffabac4e42167e5a6ce02b /lib/libedit/histedit.h | |
| parent | 3c4b6c4becf1f0078e5df17d458c36274d426a68 (diff) | |
| download | FreeBSD-src-90692e8243d9334f92182299ee401dc0a90965e2.zip FreeBSD-src-90692e8243d9334f92182299ee401dc0a90965e2.tar.gz | |
MFC r312997, r313002:
Re-import libedit 2016-02-27 and update libedit with changes from NetBSD's
2016-03-21.
Obtained from: NetBSD
Diffstat (limited to 'lib/libedit/histedit.h')
| -rw-r--r-- | lib/libedit/histedit.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/libedit/histedit.h b/lib/libedit/histedit.h index bed186e..e5449ed 100644 --- a/lib/libedit/histedit.h +++ b/lib/libedit/histedit.h @@ -1,4 +1,4 @@ -/* $NetBSD: histedit.h,v 1.53 2014/06/18 18:12:28 christos Exp $ */ +/* $NetBSD: histedit.h,v 1.55 2016/02/17 19:47:49 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -130,7 +130,7 @@ unsigned char _el_fn_sh_complete(EditLine *, int); * For operations that support set or set/get, the argument types listed are for * the "set" operation. For "get", each listed type must be a pointer. * E.g. EL_EDITMODE takes an int when set, but an int* when get. - * + * * Operations that only support "get" have the correct argument types listed. */ #define EL_PROMPT 0 /* , prompt_func); set/get */ @@ -143,7 +143,7 @@ unsigned char _el_fn_sh_complete(EditLine *, int); #define EL_ECHOTC 7 /* , const Char *, ..., NULL); set */ #define EL_SETTY 8 /* , const Char *, ..., NULL); set */ #define EL_ADDFN 9 /* , const Char *, const Char, set */ - /* el_func_t); */ + /* el_func_t); */ #define EL_HIST 10 /* , hist_fun_t, const void *); set */ #define EL_EDITMODE 11 /* , int); set/get */ #define EL_RPROMPT 12 /* , prompt_func); set/get */ @@ -251,21 +251,10 @@ int tok_str(Tokenizer *, const char *, /* * Begin Wide Character Support */ -#ifdef __linux__ -/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#endif - #include <wchar.h> #include <wctype.h> /* - * Wide character versions - */ - -/* * ==== Editing ==== */ typedef struct lineinfow { |
