As per the 'OK' at CIFS2002, only use the readline headers (and this crasy
authorAndrew Bartlett <abartlet@samba.org>
Fri, 6 Sep 2002 23:10:28 +0000 (23:10 +0000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 6 Sep 2002 23:10:28 +0000 (23:10 +0000)
#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)

source3/include/includes.h
source3/lib/readline.c

index 945ec2cbd708e2643a244c1fceeebb7e2c950fa0..dacac356e3d79b38d2abb9d167574e077d3c3383 100644 (file)
@@ -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
index d80c571dd3bb8d1aabf2b1139b8059c0420b81da..58c4ecf482dbb4c30f8690473501bff9371316d7 100644 (file)
 
 #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