FreeBSD porting issues

bk: 42dda729Gdra1kRWegFLZAdoQP59hA

diff --git a/Makefile.am b/Makefile.am
index 96918fc01dd05ffd396b16965e4fbffd78361639..6b61718e5939f3019d6b1662cd8b7e51588d1407 100644 (file)
--- 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 130b11d9273cf222257d25d36f855f5c53d2ffc8..c0b3ba4a69b2f5f6e94a4dca83ec622e25516d69 100644 (file)
--- 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 493e61f7b573fdc872ecf9b59b653686d656118c..a19f8c111d802b2f41d33c74aeff6951e9570d18 100644 (file)
--- 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;