summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-05-12 19:02:26 +0200
committerunknown <kent@mysql.com>2005-05-12 19:02:26 +0200
commitc322164a2c9be990f260f4649c03a9fd1d10958f (patch)
tree3d52da980ec9c1fa3c113dba7ce0c4f2b54e1f3b /cmd-line-utils
parentc4c1979dbf26a07c7b7366636d238781bc894829 (diff)
downloadmariadb-git-c322164a2c9be990f260f4649c03a9fd1d10958f.tar.gz
readline.c:
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2 search.c: FreeBSD needs <sys/types.h> to get 'off_t' defined cmd-line-utils/libedit/search.c: FreeBSD needs <sys/types.h> to get 'off_t' defined cmd-line-utils/libedit/readline.c: Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/readline.c2
-rw-r--r--cmd-line-utils/libedit/search.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c
index 3a38e8a99ab..616b55a877e 100644
--- a/cmd-line-utils/libedit/readline.c
+++ b/cmd-line-utils/libedit/readline.c
@@ -70,10 +70,10 @@ extern char *alloca ();
#include <fcntl.h>
#include <vis.h>
+#include "readline/readline.h"
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
#include "histedit.h"
-#include "readline/readline.h"
/* for rl_complete() */
#define TAB '\r'
diff --git a/cmd-line-utils/libedit/search.c b/cmd-line-utils/libedit/search.c
index 848429e091b..850c5f27140 100644
--- a/cmd-line-utils/libedit/search.c
+++ b/cmd-line-utils/libedit/search.c
@@ -37,6 +37,7 @@
/*
* search.c: History and character search functions
*/
+#include <sys/types.h>
#include <stdlib.h>
#if defined(REGEX)
#include <regex.h>