diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
| commit | 8bb0aaa51661bc842832ad131cb43b6f0e50f29a (patch) | |
| tree | 0138fe722f01dc674c37ea0e9b7f181bcd863f82 /acinclude.m4 | |
| parent | 1e91f015caeeec47c65b754d19ac956d79ded31d (diff) | |
| parent | 9f2b7e91b6a6eee0e4e1629ea4d55782a81c78bb (diff) | |
| download | mariadb-git-8bb0aaa51661bc842832ad131cb43b6f0e50f29a.tar.gz | |
Merge
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
SCCS merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 809e5e768e5..cf9c8c0e3c5 100644 --- 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" ], [ |