diff options
author | Georgi Kodinov <joro@sun.com> | 2009-03-09 12:52:08 +0200 |
---|---|---|
committer | Georgi Kodinov <joro@sun.com> | 2009-03-09 12:52:08 +0200 |
commit | fac9dee4748149fe4f9cd6b299d056abca1a6aa8 (patch) | |
tree | fc13e3fc31c1ad0d19e7ec9c147d743aab6cfeeb /cmd-line-utils/libedit/vi.c | |
parent | 9540d3017e8dde3e6a741f1ff5838c5af786c747 (diff) | |
parent | 774a894fe18830749d401ad4a2a96925ee951fbf (diff) | |
download | mariadb-git-fac9dee4748149fe4f9cd6b299d056abca1a6aa8.tar.gz |
merged 5.1-main -> 5.1-pe-stage
Diffstat (limited to 'cmd-line-utils/libedit/vi.c')
-rw-r--r-- | cmd-line-utils/libedit/vi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c index 602383f3231..00a9f493a9b 100644 --- a/cmd-line-utils/libedit/vi.c +++ b/cmd-line-utils/libedit/vi.c @@ -914,14 +914,14 @@ vi_comment_out(EditLine *el, int c) * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; |