Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3e1cd0ba7ynoxMLx9Fg8GKznl9ZmLA

diff --cc include/ntp_machine.h
index ef1e16f57b05226c10e992d6e255c64e58cd6916,46ef19a7e584c43cc42769892cde71ce6d6b474d..303b87e98e33c710faf96e999b06a4a3c4c093cf
--- 1/include/ntp_machine.h
--- 2/include/ntp_machine.h
+++ b/include/ntp_machine.h
@@@ -269,24 -251,14 +269,25 @@@ typedef unsigned long u_long
  # define isascii __isascii
  # define isatty _isatty
  # define mktemp _mktemp
 -# if 0
 -#  define getpid GetCurrentProcessId
 -# endif
 -# include <windows.h>
 -# include <ws2tcpip.h>
 +# define unlink _unlink
 +# define fileno _fileno
 +# define write _write
 +# define vsnprintf _vsnprintf
 +#ifndef close
 +# define close _close
 +#endif
  # undef interface
 +# include <process.h>
 +#define getpid _getpid
 +/*
 + * Defining registers are not a good idea on Windows
 + * This gets rid of the usage
 + */
 +#ifndef register
 +# define register
 +#endif
   typedef char *caddr_t;
+ # define vsnprintf _vsnprintf
  #endif /* SYS_WINNT */
  
  int ntp_set_tod P((struct timeval *tvp, void *tzp));