Commit 59f045d8 authored by unknown's avatar unknown

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
parent 94d5b4f4
...@@ -6,7 +6,6 @@ AC_DEFUN(MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY,[ ...@@ -6,7 +6,6 @@ AC_DEFUN(MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY,[
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include "stdio.h" #include "stdio.h"
#undef __P // readline-4.2 declares own __P
#include "readline/readline.h" #include "readline/readline.h"
], ],
[ [
...@@ -27,7 +26,6 @@ AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[ ...@@ -27,7 +26,6 @@ AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include "stdio.h" #include "stdio.h"
#undef __P // readline-4.2 declares own __P
#include "readline/readline.h" #include "readline/readline.h"
], ],
[ [
...@@ -49,7 +47,6 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[ ...@@ -49,7 +47,6 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include "stdio.h" #include "stdio.h"
#undef __P // readline-4.2 declares own __P
#include "readline/readline.h" #include "readline/readline.h"
], ],
[ [
......
...@@ -84,7 +84,6 @@ extern "C" { ...@@ -84,7 +84,6 @@ extern "C" {
#if defined( __WIN__) || defined(OS2) #if defined( __WIN__) || defined(OS2)
#include <conio.h> #include <conio.h>
#elif !defined(__NETWARE__) #elif !defined(__NETWARE__)
#undef __P // readline-4.2 declares own __P
#include <readline/readline.h> #include <readline/readline.h>
#define HAVE_READLINE #define HAVE_READLINE
#endif #endif
......
...@@ -50,6 +50,7 @@ __RCSID("$NetBSD: search.c,v 1.14 2002/11/20 16:50:08 christos Exp $"); ...@@ -50,6 +50,7 @@ __RCSID("$NetBSD: search.c,v 1.14 2002/11/20 16:50:08 christos Exp $");
*/ */
#include <stdlib.h> #include <stdlib.h>
#if defined(REGEX) #if defined(REGEX)
#include <sys/types.h>
#include <regex.h> #include <regex.h>
#elif defined(REGEXP) #elif defined(REGEXP)
#include <regexp.h> #include <regexp.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment