diff options
| author | vva@eagle.mysql.r18.ru <> | 2004-08-24 23:38:31 +0500 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2004-08-24 23:38:31 +0500 |
| commit | b20161b841787ef3c96e9fa08341a5d1d7c294eb (patch) | |
| tree | 6c8ae29b76f2afe074914219d315c09ba245798b /client/mysql.cc | |
| parent | 56c807b2e0b1a5723889dfc7a84815a2884ff0e3 (diff) | |
| parent | f6a3f2cfad74c208f0249bd15c4eb2a7c7e4039d (diff) | |
| download | mariadb-git-b20161b841787ef3c96e9fa08341a5d1d7c294eb.tar.gz | |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
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 0a09caa9b2a..0fb6184e78a 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; |