Merge

bk: 3cafd4c7LGRCHyMrAFDJSm3sL_RWGg

diff --cc include/ntp_machine.h
Simple merge

diff --cc include/ntp_stdlib.h
Simple merge

diff --cc include/ntpd.h
Simple merge

diff --cc libntp/a_md5encrypt.c
index 7200d843f4fb01c40df52ba233ef9f073e9ddf2d,24f7b93796053a1783ab1fcea119a7ef6eb3685c..0617132646b7b17d7b7b15b4272458ce3df7c4cd
--- 1/libntp/a_md5encrypt.c
--- 2/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@@ -11,14 -11,19 +11,14 @@@
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
 -
+ 
+ #include "ntp_machine.h"
  #include <stdio.h>
 -
  #include "ntp_types.h"
  #include "ntp_string.h"
 +#include "ntp_stdlib.h"
  #include "global.h"
  #include "md5.h"
 -#include "ntp_stdlib.h"
 -
 -#define BLOCK_OCTETS  16      /* message digest size */
 -
  
  /*
   * MD5authencrypt - generate MD5 message authenticator

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge

diff --cc ntpd/ntp_refclock.c
Simple merge

diff --cc ntpd/ntp_request.c
Simple merge

diff --cc ntpd/ntp_util.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge

diff --cc ntpd/refclock_dumbclock.c
Simple merge

diff --cc ntpd/refclock_hopfser.c
Simple merge

diff --cc ntpd/refclock_nmea.c
Simple merge

diff --cc ntpd/refclock_palisade.c
Simple merge

diff --cc ntpdc/ntpdc.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge

diff --cc ports/winnt/include/config.h
index 045a7c3847dd2f8dfea2301f9d2f32f36d6adaa9,2223d1a3195be4008b8453991bcf34ddb261dd50..c405a70bd573602275e31c67117ea5dfffbe4021
--- 1/ports/winnt/include/config.h
--- 2/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@@ -16,8 -23,22 +23,20 @@@
  #if !defined _WIN32_WINNT || _WIN32_WINNT < 0x0400
  # error Please define _WIN32_WINNT in the project settings/makefile
  #endif
+ /*
+  * ANSI C compliance enabled
+  */
+ #define __STDC__ 1
+ 
+ #ifndef _WINSOCKAPI_
+ #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
+ #endif
+ #ifndef __RPCASYNC_H__
+ #define __RPCASYNC_H__        /* Skip asynch rpc inclusion */
+ #endif
+ 
  # undef  OPEN_BCAST_SOCKET            /* for  ntp_io.c */                                                                                                     
  # undef  UDP_WILDCARD_DELIVERY        /* for  ntp_io.c */                             /*      98/06/01  */
 -# undef  DES                          /* from libntp.mak */
 -# define  MD5                         /* from libntp.mak */   
  # define HAVE_RANDOM 
  #define MAXHOSTNAMELEN 64
  #define AUTOKEY