diff options
| author | unknown <serg@serg.mylan> | 2004-08-24 22:37:05 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-24 22:37:05 +0200 |
| commit | 5b1c2decaa86180d085d6e0d40a4ff7dd2d42cae (patch) | |
| tree | 005b15e3535036e9a42ad1cd4397fc68ab313d4e | |
| parent | 5aca69d9a1857b1f337ea181ac739e1ab6b7f02d (diff) | |
| download | mariadb-git-5b1c2decaa86180d085d6e0d40a4ff7dd2d42cae.tar.gz | |
compatibility fixes
client/mysql.cc:
removed readline-4.2 compatibility fix
readline 4.2 is broken, use 4.2a instead
cmd-line-utils/libedit/search.c:
regex.h fix
acinclude.m4:
removed readline-4.2 compatibility fix
readline 4.2 is broken, use 4.2a instead
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | client/mysql.cc | 1 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/search.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1b49f2bbdf4..7c11462d290 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -6,7 +6,6 @@ AC_DEFUN(MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY,[ AC_TRY_COMPILE( [ #include "stdio.h" - #undef __P // readline-4.2 declares own __P #include "readline/readline.h" ], [ @@ -27,7 +26,6 @@ AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[ AC_TRY_COMPILE( [ #include "stdio.h" - #undef __P // readline-4.2 declares own __P #include "readline/readline.h" ], [ @@ -49,7 +47,6 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[ AC_TRY_COMPILE( [ #include "stdio.h" - #undef __P // readline-4.2 declares own __P #include "readline/readline.h" ], [ diff --git a/client/mysql.cc b/client/mysql.cc index 0fb6184e78a..be4c6d3df3c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -84,7 +84,6 @@ 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 diff --git a/cmd-line-utils/libedit/search.c b/cmd-line-utils/libedit/search.c index 48049687875..0957529485c 100644 --- a/cmd-line-utils/libedit/search.c +++ b/cmd-line-utils/libedit/search.c @@ -50,6 +50,7 @@ __RCSID("$NetBSD: search.c,v 1.14 2002/11/20 16:50:08 christos Exp $"); */ #include <stdlib.h> #if defined(REGEX) +#include <sys/types.h> #include <regex.h> #elif defined(REGEXP) #include <regexp.h> |