From 1532a34658128c944defafbd5a76380bcbe7acb1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 6 Aug 2020 17:52:48 +1000 Subject: [PATCH 1/2] Stop deprecated functions being defined --- bin/dig/nslookup.c | 2 ++ bin/nsupdate/nsupdate.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 08ee5e36d9..e1921585a5 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -47,6 +47,8 @@ #elif defined(HAVE_EDITLINE_READLINE_H) #include #elif defined(HAVE_READLINE_READLINE_H) +/* Prevent deprecated functions being declared. */ +#define _FUNCTION_DEF 1 #include #if defined(HAVE_READLINE_HISTORY_H) #include diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index b7fc15fbc8..3537879397 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -103,6 +103,8 @@ #elif defined(HAVE_EDITLINE_READLINE_H) #include #else /* if defined(HAVE_EDIT_READLINE_READLINE_H) */ +/* Prevent deprecated functions being declared. */ +#define _FUNCTION_DEF 1 #include #include #endif /* if defined(HAVE_EDIT_READLINE_READLINE_H) */ From fd126553d450320eab1094508f6f2d7c76d737f5 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 11 Aug 2020 22:02:10 +1000 Subject: [PATCH 2/2] Ensure rl_message() gets prototype. --- bin/dig/nslookup.c | 3 +++ bin/nsupdate/nsupdate.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index e1921585a5..7309c8cdbf 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -49,6 +49,9 @@ #elif defined(HAVE_READLINE_READLINE_H) /* Prevent deprecated functions being declared. */ #define _FUNCTION_DEF 1 +/* Ensure rl_message() gets prototype. */ +#define USE_VARARGS 1 +#define PREFER_STDARG 1 #include #if defined(HAVE_READLINE_HISTORY_H) #include diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 3537879397..654c6508d8 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -105,6 +105,9 @@ #else /* if defined(HAVE_EDIT_READLINE_READLINE_H) */ /* Prevent deprecated functions being declared. */ #define _FUNCTION_DEF 1 +/* Ensure rl_message() gets prototype. */ +#define USE_VARARGS 1 +#define PREFER_STDARG 1 #include #include #endif /* if defined(HAVE_EDIT_READLINE_READLINE_H) */