Commit 65919873 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

Merge pilot.(none):/data/msvensson/mysql/bug10218/my41-bug10218 

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
parents 9317cd4c 5df79044

cmd-line-utils/libedit/el_term.h

+10 −0
Original line number Diff line number Diff line
@@ -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);

configure.in

+13 −0
Original line number Diff line number Diff line
@@ -1954,6 +1954,19 @@ else 
fi

AC_SUBST(TERMCAP_LIB)



# Check if the termcap function 'tgoto' is already declared in

# system header files or if it need to be declared locally

AC_CHECK_DECLS(tgoto,,,[

#ifdef HAVE_CURSES_H

# include <curses.h>

#elif HAVE_NCURSES_H

# include <ncurses.h>

#endif

#ifdef HAVE_TERM_H

# include <term.h>

#endif

])



LIBEDIT_LOBJECTS=""

AC_CHECK_FUNC(strunvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS unvis.o"])

AC_CHECK_FUNC(strvis,   ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS vis.o"])