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 | 55ee289f587f107fa03c5f889491fdaab101df2d (patch) | |
| tree | f6d4299d643c4b552693b82fe815bdc810ae0d36 | |
| parent | 7c2a667640b01a0f19ddc3515c5ca7ac43d26e25 (diff) | |
| download | samba-55ee289f587f107fa03c5f889491fdaab101df2d.tar.gz samba-55ee289f587f107fa03c5f889491fdaab101df2d.tar.xz samba-55ee289f587f107fa03c5f889491fdaab101df2d.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
| -rw-r--r-- | source/include/includes.h | 18 | ||||
| -rw-r--r-- | source/lib/readline.c | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index 945ec2cbd70..dacac356e3d 100644 --- a/source/include/includes.h +++ b/source/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/source/lib/readline.c b/source/lib/readline.c index d80c571dd3b..58c4ecf482d 100644 --- a/source/lib/readline.c +++ b/source/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 |