summaryrefslogtreecommitdiff
path: root/cmd-line-utils/readline
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-07-18 18:00:19 -0700
committerunknown <jimw@mysql.com>2005-07-18 18:00:19 -0700
commit42d10743d14ac79b4cf8a1feabb724e1c8355d4f (patch)
tree9350e11f26848d5f72c50498440c9a5a4062e418 /cmd-line-utils/readline
parentbb2fb2af223453682932201e92b56f275fd8f039 (diff)
downloadmariadb-git-42d10743d14ac79b4cf8a1feabb724e1c8355d4f.tar.gz
Reimplement use of "config_readline.h" to get readline configuration.
cmd-line-utils/readline/bind.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/callback.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/compat.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/complete.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/display.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/funmap.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histexpand.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histfile.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/history.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histsearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/input.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/isearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/keymaps.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/kill.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/macro.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/mbutil.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/misc.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/nls.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/parens.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/readline.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/rltty.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/savestring.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/search.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/shell.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/signals.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/terminal.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/text.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/tilde.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/undo.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/util.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/vi_mode.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/xmalloc.c: Include local config_readline.h instead of config.h
Diffstat (limited to 'cmd-line-utils/readline')
-rw-r--r--cmd-line-utils/readline/bind.c4
-rw-r--r--cmd-line-utils/readline/callback.c4
-rw-r--r--cmd-line-utils/readline/compat.c4
-rw-r--r--cmd-line-utils/readline/complete.c4
-rw-r--r--cmd-line-utils/readline/display.c4
-rw-r--r--cmd-line-utils/readline/funmap.c4
-rw-r--r--cmd-line-utils/readline/histexpand.c4
-rw-r--r--cmd-line-utils/readline/histfile.c4
-rw-r--r--cmd-line-utils/readline/history.c4
-rw-r--r--cmd-line-utils/readline/histsearch.c4
-rw-r--r--cmd-line-utils/readline/input.c4
-rw-r--r--cmd-line-utils/readline/isearch.c4
-rw-r--r--cmd-line-utils/readline/keymaps.c4
-rw-r--r--cmd-line-utils/readline/kill.c4
-rw-r--r--cmd-line-utils/readline/macro.c4
-rw-r--r--cmd-line-utils/readline/mbutil.c4
-rw-r--r--cmd-line-utils/readline/misc.c4
-rw-r--r--cmd-line-utils/readline/nls.c4
-rw-r--r--cmd-line-utils/readline/parens.c4
-rw-r--r--cmd-line-utils/readline/readline.c4
-rw-r--r--cmd-line-utils/readline/rltty.c4
-rw-r--r--cmd-line-utils/readline/savestring.c3
-rw-r--r--cmd-line-utils/readline/search.c4
-rw-r--r--cmd-line-utils/readline/shell.c4
-rw-r--r--cmd-line-utils/readline/signals.c4
-rw-r--r--cmd-line-utils/readline/terminal.c4
-rw-r--r--cmd-line-utils/readline/text.c4
-rw-r--r--cmd-line-utils/readline/tilde.c4
-rw-r--r--cmd-line-utils/readline/undo.c4
-rw-r--r--cmd-line-utils/readline/util.c4
-rw-r--r--cmd-line-utils/readline/vi_mode.c4
-rw-r--r--cmd-line-utils/readline/xmalloc.c4
32 files changed, 33 insertions, 94 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c
index 15d0e4e3a65..17f61d1df08 100644
--- a/cmd-line-utils/readline/bind.c
+++ b/cmd-line-utils/readline/bind.c
@@ -26,9 +26,7 @@
# include <floss.h>
#endif
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/callback.c b/cmd-line-utils/readline/callback.c
index 5b05ea5c5b7..0807f137b92 100644
--- a/cmd-line-utils/readline/callback.c
+++ b/cmd-line-utils/readline/callback.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include "rlconf.h"
diff --git a/cmd-line-utils/readline/compat.c b/cmd-line-utils/readline/compat.c
index a66d210fd2e..e4fbc322cee 100644
--- a/cmd-line-utils/readline/compat.c
+++ b/cmd-line-utils/readline/compat.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index d212f61840e..2196c66a54c 100644
--- a/cmd-line-utils/readline/complete.c
+++ b/cmd-line-utils/readline/complete.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <fcntl.h>
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index 0ff428e44e9..cab76c0da81 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/funmap.c b/cmd-line-utils/readline/funmap.c
index 28c8cc67c9f..d56ffb9fadc 100644
--- a/cmd-line-utils/readline/funmap.c
+++ b/cmd-line-utils/readline/funmap.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#if !defined (BUFSIZ)
#include <stdio.h>
diff --git a/cmd-line-utils/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c
index 2ab34cba269..47f97e9a6f7 100644
--- a/cmd-line-utils/readline/histexpand.c
+++ b/cmd-line-utils/readline/histexpand.c
@@ -22,9 +22,7 @@
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c
index 717bbee6fd7..7d340b346d4 100644
--- a/cmd-line-utils/readline/histfile.c
+++ b/cmd-line-utils/readline/histfile.c
@@ -30,9 +30,7 @@
# include <floss.h>
#endif
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
diff --git a/cmd-line-utils/readline/history.c b/cmd-line-utils/readline/history.c
index d99b76e8744..bb1960d8d99 100644
--- a/cmd-line-utils/readline/history.c
+++ b/cmd-line-utils/readline/history.c
@@ -25,9 +25,7 @@
you can call. I think I have done that. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
diff --git a/cmd-line-utils/readline/histsearch.c b/cmd-line-utils/readline/histsearch.c
index 1cc5875a4b4..778b323afdc 100644
--- a/cmd-line-utils/readline/histsearch.c
+++ b/cmd-line-utils/readline/histsearch.c
@@ -22,9 +22,7 @@
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
#if defined (HAVE_STDLIB_H)
diff --git a/cmd-line-utils/readline/input.c b/cmd-line-utils/readline/input.c
index 044338e879b..1981061eac6 100644
--- a/cmd-line-utils/readline/input.c
+++ b/cmd-line-utils/readline/input.c
@@ -25,9 +25,7 @@
# include <floss.h>
#endif
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <fcntl.h>
diff --git a/cmd-line-utils/readline/isearch.c b/cmd-line-utils/readline/isearch.c
index c1ea5b30852..f7b0f1404e9 100644
--- a/cmd-line-utils/readline/isearch.c
+++ b/cmd-line-utils/readline/isearch.c
@@ -26,9 +26,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/keymaps.c b/cmd-line-utils/readline/keymaps.c
index 70d0cc08d3f..2be03f7086f 100644
--- a/cmd-line-utils/readline/keymaps.c
+++ b/cmd-line-utils/readline/keymaps.c
@@ -20,9 +20,7 @@
Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#if defined (HAVE_STDLIB_H)
# include <stdlib.h>
diff --git a/cmd-line-utils/readline/kill.c b/cmd-line-utils/readline/kill.c
index 1d3254c3275..061bdafcf9a 100644
--- a/cmd-line-utils/readline/kill.c
+++ b/cmd-line-utils/readline/kill.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/macro.c b/cmd-line-utils/readline/macro.c
index b73c3af9aa4..f7b77a831b8 100644
--- a/cmd-line-utils/readline/macro.c
+++ b/cmd-line-utils/readline/macro.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c
index 9a8f17c0f74..c88e9485f39 100644
--- a/cmd-line-utils/readline/mbutil.c
+++ b/cmd-line-utils/readline/mbutil.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <fcntl.h>
diff --git a/cmd-line-utils/readline/misc.c b/cmd-line-utils/readline/misc.c
index ab1e1337fd3..810b940edab 100644
--- a/cmd-line-utils/readline/misc.c
+++ b/cmd-line-utils/readline/misc.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
diff --git a/cmd-line-utils/readline/nls.c b/cmd-line-utils/readline/nls.c
index bcee87561aa..4f28152f316 100644
--- a/cmd-line-utils/readline/nls.c
+++ b/cmd-line-utils/readline/nls.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/parens.c b/cmd-line-utils/readline/parens.c
index 737f7675e93..bb893ac1bfb 100644
--- a/cmd-line-utils/readline/parens.c
+++ b/cmd-line-utils/readline/parens.c
@@ -27,9 +27,7 @@
#include "rlconf.h"
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/readline.c b/cmd-line-utils/readline/readline.c
index a70d80ff492..e82db84c9dc 100644
--- a/cmd-line-utils/readline/readline.c
+++ b/cmd-line-utils/readline/readline.c
@@ -22,9 +22,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include "posixstat.h"
diff --git a/cmd-line-utils/readline/rltty.c b/cmd-line-utils/readline/rltty.c
index 1a31f35952e..3e9c71c8df1 100644
--- a/cmd-line-utils/readline/rltty.c
+++ b/cmd-line-utils/readline/rltty.c
@@ -22,9 +22,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <signal.h>
diff --git a/cmd-line-utils/readline/savestring.c b/cmd-line-utils/readline/savestring.c
index 820428d8881..ae605374d13 100644
--- a/cmd-line-utils/readline/savestring.c
+++ b/cmd-line-utils/readline/savestring.c
@@ -21,7 +21,8 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#include <config.h>
+#include "config_readline.h"
+
#ifdef HAVE_STRING_H
# include <string.h>
#endif
diff --git a/cmd-line-utils/readline/search.c b/cmd-line-utils/readline/search.c
index ce7d54eb799..1878d2bf031 100644
--- a/cmd-line-utils/readline/search.c
+++ b/cmd-line-utils/readline/search.c
@@ -22,9 +22,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <stdio.h>
diff --git a/cmd-line-utils/readline/shell.c b/cmd-line-utils/readline/shell.c
index a07e2b96fc1..41668d70ab5 100644
--- a/cmd-line-utils/readline/shell.c
+++ b/cmd-line-utils/readline/shell.c
@@ -22,9 +22,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/signals.c b/cmd-line-utils/readline/signals.c
index 8e9c0ae60e5..be1150f6c54 100644
--- a/cmd-line-utils/readline/signals.c
+++ b/cmd-line-utils/readline/signals.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h> /* Just for NULL. Yuck. */
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/terminal.c b/cmd-line-utils/readline/terminal.c
index b95aea89b3d..3545fce5b85 100644
--- a/cmd-line-utils/readline/terminal.c
+++ b/cmd-line-utils/readline/terminal.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include "posixstat.h"
diff --git a/cmd-line-utils/readline/text.c b/cmd-line-utils/readline/text.c
index d917e99b9bd..ad7b53ec422 100644
--- a/cmd-line-utils/readline/text.c
+++ b/cmd-line-utils/readline/text.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
diff --git a/cmd-line-utils/readline/tilde.c b/cmd-line-utils/readline/tilde.c
index 07fa374e1d1..c44357ffbea 100644
--- a/cmd-line-utils/readline/tilde.c
+++ b/cmd-line-utils/readline/tilde.c
@@ -21,9 +21,7 @@
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#if defined (HAVE_UNISTD_H)
# ifdef _MINIX
diff --git a/cmd-line-utils/readline/undo.c b/cmd-line-utils/readline/undo.c
index 25c287b5a2d..48baded332a 100644
--- a/cmd-line-utils/readline/undo.c
+++ b/cmd-line-utils/readline/undo.c
@@ -22,9 +22,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/util.c b/cmd-line-utils/readline/util.c
index a632d81129c..43478aaf1ac 100644
--- a/cmd-line-utils/readline/util.c
+++ b/cmd-line-utils/readline/util.c
@@ -21,9 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
#include <fcntl.h>
diff --git a/cmd-line-utils/readline/vi_mode.c b/cmd-line-utils/readline/vi_mode.c
index 74d8acbbc05..9a8cfdd7200 100644
--- a/cmd-line-utils/readline/vi_mode.c
+++ b/cmd-line-utils/readline/vi_mode.c
@@ -31,9 +31,7 @@
#if defined (VI_MODE)
-#if defined (HAVE_CONFIG_H)
-# include <config.h>
-#endif
+#include "config_readline.h"
#include <sys/types.h>
diff --git a/cmd-line-utils/readline/xmalloc.c b/cmd-line-utils/readline/xmalloc.c
index 8985d340d39..698807addf9 100644
--- a/cmd-line-utils/readline/xmalloc.c
+++ b/cmd-line-utils/readline/xmalloc.c
@@ -20,9 +20,7 @@
Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY
-#if defined (HAVE_CONFIG_H)
-#include <config.h>
-#endif
+#include "config_readline.h"
#include <stdio.h>