-ledit cleanup for ntpdc and ntpq.

bk: 47185548cLaOdAKwtLWDse_-wT9UHQ

diff --git a/ChangeLog b/ChangeLog
index c1b0713d83132d15a7071692fc6624c3822b8b95..3791a3e820d9553bd6e6b73ef5d72cd909741c85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* -ledit cleanup for ntpdc and ntpq.
 * Association and other cleanup from Dave Mills.
 * NTP_UNREACH changes from Dave Mills.
 * Fix the readline history test.

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index cc88dd33a0cc02276897516b68c99b6b91b1b065..0e7b395ec2d6408d28ae7dd721d9b2d3443567dc 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -32,7 +32,7 @@
 #endif /* HAVE_LIBREADLINE */
 
 #if defined (HAVE_LIBEDIT)
-# include <editline/readline.h>
+# include <histedit.h>
 #endif /* HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
@@ -1132,7 +1132,7 @@ again:
 static void
 getcmds(void)
 {
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+#if defined(HAVE_LIBREADLINE)
        char *line;
 
        for (;;) {
@@ -1141,7 +1141,7 @@ getcmds(void)
                docmd(line);
                free(line);
        }
-#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
+#else /* not (HAVE_LIBREADLINE) */
        char line[MAXLINE];
 
        for (;;) {

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 119526bb7e8bb9a8a740a3f6ec64467ec9e0f1a6..1d1a97904141c57b150aba3a5c5f37332f48102d 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -37,7 +37,7 @@
 #endif /* HAVE_LIBREADLINE */
 
 #if defined(HAVE_LIBEDIT)
-# include <editline/readline.h>
+# include <histedit.h>
 #endif /* HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
@@ -1396,7 +1396,7 @@ doquery(
 static void
 getcmds(void)
 {
-#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+#if defined(HAVE_LIBREADLINE)
         char *line;
 
         for (;;) {
@@ -1405,7 +1405,7 @@ getcmds(void)
                 docmd(line);
                 free(line);
         }
-#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
+#else /* not (HAVE_LIBREADLINE) */
         char line[MAXLINE];
 
         for (;;) {