compatibility fixes

0c950c5b · serg@serg.mylan · 1538c318 · 0c950c5b · 0c950c5b · 0c950c5b
Commit 0c950c5b authored Aug 24, 2004 by serg@serg.mylan
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

acinclude.m4 acinclude.m4 +0 -3

client/mysql.cc client/mysql.cc +0 -1

cmd-line-utils/libedit/search.c cmd-line-utils/libedit/search.c +1 -0

No files found.
--- 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"
 	    ],
 	    [ 

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

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