Merge pogo.udel.edu:/pogo/users/mayer/ntp-dev-dyn

into  pogo.udel.edu:/pogo/users/kardel/ntp-dev

bk: 4312cb8aG9bHzUjvYd6Tgnuj2nx8Ag

diff --cc ntpd/ntp_io.c
index 54e4c9533cc420c935c22918107750281f738fc2,6c243da608e2b370f13c544c3241efd59f5c27c7..9bbe1b301dc17d18fdeca319d20da9e506050922
--- 1/ntpd/ntp_io.c
--- 2/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -448,7 -448,6 +448,7 @@@ print_interface(struct interface *iface
  
  #endif
  
- #ifdef SUPPORT_ASYNCIO_READER
++#if defined(HAVE_IO_COMPLETION_PORT) && defined(HAS_BSD_ROUTING_SOCKET)
  /*
   * create an asyncio_reader structure
   */
@@@ -497,7 -496,7 +497,8 @@@ remove_asyncio_reader(struct asyncio_re
  
        reader->fd = INVALID_SOCKET;
  }
- #endif        
 -      
++#endif /* defined(HAVE_IO_COMPLETION_PORT) && defined(HAS_BSD_ROUTING_SOCKET) */
++
  /*
   * interface list enumerator - visitor pattern
   */
@@@ -2610,8 -2607,8 +2611,9 @@@ input_handler
                }
        }
  
++#ifdef HAS_BSD_ROUTING_SOCKET
        /*
--       * scan list of asyncio readers
++       * scan list of asyncio readers - currently only used for routing sockets
         */
        for (asyncio_reader = ISC_LIST_TAIL(asyncio_reader_list);
             asyncio_reader != NULL;
@@@ -2621,6 -2618,6 +2623,7 @@@
                        asyncio_reader->receiver(asyncio_reader);
                }
        }
++#endif /* HAS_BSD_ROUTING_SOCKET */
        
        /*
         * Done everything from that select.
@@@ -3261,7 -3258,7 +3264,7 @@@ find_flagged_addr_in_list(struct sockad
        return NULL; /* Not found */
  }
  
- #ifdef SUPPORT_ASYNCIO_READER
 -#if defined(__NetBSD__) || defined(__FreeBSD__)
++#ifdef HAS_BSD_ROUTING_SOCKET
  #include <net/route.h>
  
  static void