From fa4ffc45f40d61c1923c91d070dd3890fc5a01e6 Mon Sep 17 00:00:00 2001
From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 19 Jul 2005 21:21:45 -0400
Subject: [PATCH] FreeBSD porting issues

bk: 42dda729Gdra1kRWegFLZAdoQP59hA
---
 Makefile.am   | 10 +++++-----
 ntpdc/ntpdc.c |  6 +++++-
 ntpq/ntpq.c   |  6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 96918fc01..6b61718e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,7 @@ EXTRA_DIST = \
 	ports \
 	version
 
-DISTCLEANFILES = .warning
+DISTCLEANFILES = .gcc-warning
 
 #ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
 ETAGS_ARGS = Makefile.am configure.in
@@ -75,8 +75,8 @@ ETAGS_ARGS = Makefile.am configure.in
 # HMS: make ports be the last directory...
 # DIST_HOOK_DIRS = conf html scripts ports
 
-# HMS: Keep .warning first, as that way it gets printed first.
-BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
+# HMS: Keep .gcc-warning first, as that way it gets printed first.
+BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version
 
 $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
 	( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
@@ -100,7 +100,7 @@ dist-hook:
 	@for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \
 	   do chmod u+w $$i ; unix2dos $$i $$i; done
 
-.warning:
+.gcc-warning:
 	@echo "Compiling with GCC now generates lots of new warnings."
 	@echo " "
 	@echo "Don't be concerned. They're just warnings."
@@ -110,7 +110,7 @@ dist-hook:
 	@echo "Feel free to send patches that fix these warnings, though."
 	@echo " "
 	@sleep 1
-	@touch .warning
+	@touch .gcc-warning
 
 # HMS: The following seems to be a work-in-progress...
 
diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 130b11d92..c0b3ba4a6 100644
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -449,7 +449,11 @@ openhost(
 	hints.ai_flags = AI_NUMERICHOST;
 
 	a_info = getaddrinfo(hname, service, &hints, &ai);
-	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
+	if (a_info == EAI_NONAME
+#ifdef EAI_NODATA
+	    || a_info == EAI_NODATA
+#endif
+	   ) {
 		hints.ai_flags = AI_CANONNAME;
 #ifdef AI_ADDRCONFIG
 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 493e61f7b..a19f8c111 100644
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -631,7 +631,11 @@ openhost(
 	hints.ai_flags = AI_NUMERICHOST;
 
 	a_info = getaddrinfo(hname, service, &hints, &ai);
-	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
+	if (a_info == EAI_NONAME
+#ifdef EAI_NODATA
+	    || a_info == EAI_NODATA
+#endif
+	   ) {
 		hints.ai_flags = AI_CANONNAME;
 #ifdef AI_ADDRCONFIG
 		hints.ai_flags |= AI_ADDRCONFIG;
-- 
2.47.3