diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 23:10:28 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 23:10:28 +0000 |
| commit | df4e6c9bcc2bb007e07c6f775e33f9174ea57931 (patch) | |
| tree | 59eaae2520ddafe2667dfc61796e1506d0c2a705 | |
| parent | 7a76d0e854c0c6aef0cb6f2bc68616ad7c557e0b (diff) | |
| download | samba-df4e6c9bcc2bb007e07c6f775e33f9174ea57931.tar.gz samba-df4e6c9bcc2bb007e07c6f775e33f9174ea57931.tar.bz2 samba-df4e6c9bcc2bb007e07c6f775e33f9174ea57931.zip | |
As per the 'OK' at CIFS2002, only use the readline headers (and this crasy
#ifdef mess...) in readline.c, we don't need or use them in the rest of Samba.
(This OK was of course conditional on 'if you break it, you better fix it...')
Andrew Bartlett
(This used to be commit 55ee289f587f107fa03c5f889491fdaab101df2d)
| -rw-r--r-- | source3/include/includes.h | 18 | ||||
| -rw-r--r-- | source3/lib/readline.c | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 945ec2cbd7..dacac356e3 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -902,24 +902,6 @@ struct functable { #define ULTRIX_AUTH 1 #endif -#ifdef HAVE_LIBREADLINE -# ifdef HAVE_READLINE_READLINE_H -# include <readline/readline.h> -# ifdef HAVE_READLINE_HISTORY_H -# include <readline/history.h> -# endif -# else -# ifdef HAVE_READLINE_H -# include <readline.h> -# ifdef HAVE_HISTORY_H -# include <history.h> -# endif -# else -# undef HAVE_LIBREADLINE -# endif -# endif -#endif - #ifndef HAVE_STRDUP char *strdup(const char *s); #endif diff --git a/source3/lib/readline.c b/source3/lib/readline.c index d80c571dd3..58c4ecf482 100644 --- a/source3/lib/readline.c +++ b/source3/lib/readline.c @@ -21,6 +21,24 @@ #include "includes.h" +#ifdef HAVE_LIBREADLINE +# ifdef HAVE_READLINE_READLINE_H +# include <readline/readline.h> +# ifdef HAVE_READLINE_HISTORY_H +# include <readline/history.h> +# endif +# else +# ifdef HAVE_READLINE_H +# include <readline.h> +# ifdef HAVE_HISTORY_H +# include <history.h> +# endif +# else +# undef HAVE_LIBREADLINE +# endif +# endif +#endif + #ifdef HAVE_NEW_LIBREADLINE # define RL_COMPLETION_CAST (rl_completion_func_t *) #else |