diff options
| author | vva@eagle.mysql.r18.ru <> | 2004-08-24 19:23:23 +0500 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2004-08-24 19:23:23 +0500 |
| commit | f6a3f2cfad74c208f0249bd15c4eb2a7c7e4039d (patch) | |
| tree | 9448cab63e74b61a56dbd133d3ef099a5244f068 /client/mysql.cc | |
| parent | f0fffbe21b6ab3fb9303acaad99872e3844ddef5 (diff) | |
| download | mariadb-git-f6a3f2cfad74c208f0249bd15c4eb2a7c7e4039d.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)
Diffstat (limited to 'client/mysql.cc')
| -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; |