From f801ad359290c51d3216c755fb2a8344babb484f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Sep 2005 15:59:43 +0000
Subject: r10510: Decrease the amount of data included by includes.h a bit
 (This used to be commit 03647e1321cf6c9bd6ced3945265f635e9468973)

---
 source4/lib/cmdline/popt_common.c |  1 +
 source4/lib/cmdline/readline.c    | 26 +-------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'source4/lib/cmdline')

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 43ea203b78..76c8a537e3 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
+#include "credentials.h"
 
 /* Handle command line options:
  *		-d,--debuglevel 
diff --git a/source4/lib/cmdline/readline.c b/source4/lib/cmdline/readline.c
index 7928b8db2e..52f45eb759 100644
--- a/source4/lib/cmdline/readline.c
+++ b/source4/lib/cmdline/readline.c
@@ -23,31 +23,7 @@
 #include "pstring.h"
 
 #include <unistd.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
-/* This type is missing from libreadline<4.0  (approximately) */
-#  define RL_COMPLETION_CAST
-#endif /* HAVE_NEW_LIBREADLINE */
+#include "system/readline.h"
 
 /****************************************************************************
  Display the prompt and wait for input. Call callback() regularly
-- 
cgit