diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 19:23:23 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-24 19:23:23 +0500 |
| commit | de225e637a65366aab0ad5fd8b08f24af8ee8f67 (patch) | |
| tree | 9448cab63e74b61a56dbd133d3ef099a5244f068 /client | |
| parent | 83e3d3f9a3ab6888292b8bcb15e0f77f00249289 (diff) | |
| download | mariadb-git-de225e637a65366aab0ad5fd8b08f24af8ee8f67.tar.gz | |
fixed :
Bug #3937 fails to compile with both gcc 3.3.3/icc8
Bug #4728 mysql couldn't be compiled using system readline (readline-4.3)
acinclude.m4:
1. added defun MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY for last versions of readline and libedit
2. added #undef __P in defuns MYSQL_CHECK_LIBEDIT_INTERFACE, MYSQL_CHECK_NEW_RL_INTERFACE
client/mysql.cc:
1. added #undef __P before #include "readline/readline.h" because readline-4.2 declares own __P
2. changed !defined(USE_LIBEDIT_INTERFACE) to !defined(HAVE_HIST_ENTRY) before declaring of own hist_entry
because latest versions of libedit declare hist_entry too
cmd-line-utils/Makefile.am:
added copyright header
configure.in:
1. added comment for --with-readline/--with-libedit options
2. added define for HAVE_HIST_ENTRY and macro to check it
3. added AC_LANG_CPLUSPLUS before readline/libedit checks
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 015c168cea7..0f2fd5d1004 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -84,6 +84,7 @@ extern "C" { #if defined( __WIN__) || defined(OS2) #include <conio.h> #elif !defined(__NETWARE__) +#undef __P // readline-4.2 declares own __P #include <readline/readline.h> #define HAVE_READLINE #endif @@ -294,7 +295,7 @@ static const char *server_default_groups[]= HIST_ENTRY is defined for libedit, but not for the real readline Need to redefine it for real readline to find it */ -#if !defined(USE_LIBEDIT_INTERFACE) +#if !defined(HAVE_HIST_ENTRY) typedef struct _hist_entry { const char *line; const char *data; |