diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 09:22:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 09:22:26 +0200 |
| commit | ca6d71248ebeda965a4a1defa847e9e880547632 (patch) | |
| tree | 518c772ed37e69c5625f816fa7a7a8db081c47f0 /cmd-line-utils | |
| parent | 83f622117593c9103fc8469399ffddcf5a91da1b (diff) | |
| parent | 703308a65aed7857a3c97711d6e74834a9b09b7a (diff) | |
| download | mariadb-git-ca6d71248ebeda965a4a1defa847e9e880547632.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
configure.in:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/el_term.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmd-line-utils/libedit/el_term.h b/cmd-line-utils/libedit/el_term.h index 9e5588ee96f..00ca48e38e2 100644 --- a/cmd-line-utils/libedit/el_term.h +++ b/cmd-line-utils/libedit/el_term.h @@ -90,6 +90,16 @@ extern char* tgoto(const char*, int, int); extern char* tgetstr(char*, char**); #endif + +#if !HAVE_DECL_TGOTO +/* + 'tgoto' is not declared in the system header files, this causes + problems on 64-bit systems. The function returns a 64 bit pointer + but caller see it as "int" and it's thus truncated to 32-bit +*/ +extern char* tgoto(const char*, int, int); +#endif + protected void term_move_to_line(EditLine *, int); protected void term_move_to_char(EditLine *, int); protected void term_clear_EOL(EditLine *, int); |