database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fixed :

Browse Source 
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
This commit is contained in:
unknown
2004-08-24 19:23:23 +05:00
parent 83e3d3f9a3
commit de225e637a
4 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysql.cc
View File

@@ -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;