Commit 5b1c2dec authored by unknown's avatar unknown
Browse files

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 5aca69d9

acinclude.m4

+0 −3
Original line number Diff line number Diff line
@@ -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"

	    ],

	    [

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -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

cmd-line-utils/libedit/search.c

+1 −0
Original line number Diff line number Diff line
@@ -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>