diff options
| author | unknown <matt@mysql.com> | 2005-05-18 04:06:27 +0200 |
|---|---|---|
| committer | unknown <matt@mysql.com> | 2005-05-18 04:06:27 +0200 |
| commit | 0c11874d67bcf773d9ebb36ffea2b03a2bf741a5 (patch) | |
| tree | e59b6c13facdef375c790f926a8a7f1e2005e169 /cmd-line-utils | |
| parent | 159aac80154f42464901f6ac3a9b1f692fd881ab (diff) | |
| parent | 420e480e012997245855443d197afe7858e5b872 (diff) | |
| download | mariadb-git-0c11874d67bcf773d9ebb36ffea2b03a2bf741a5.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
configure.in:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item_strfunc.h:
Auto merged
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/makelist.sh | 4 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/readline.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/search.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/makelist.sh b/cmd-line-utils/libedit/makelist.sh index 502604791f5..f15b3d1eb9f 100644 --- a/cmd-line-utils/libedit/makelist.sh +++ b/cmd-line-utils/libedit/makelist.sh @@ -87,7 +87,7 @@ case $FLAG in cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; @@ -170,7 +170,7 @@ case $FLAG in cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; 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> |