diff options
Diffstat (limited to 'contrib/ntp/include/ntp_machine.h')
| -rw-r--r-- | contrib/ntp/include/ntp_machine.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/contrib/ntp/include/ntp_machine.h b/contrib/ntp/include/ntp_machine.h index 4f7f345..d14f5c1 100644 --- a/contrib/ntp/include/ntp_machine.h +++ b/contrib/ntp/include/ntp_machine.h @@ -6,11 +6,18 @@ #define __ntp_machine #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> +#ifdef TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +#else +# ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +# else +# include <time.h> +# endif #endif #include "ntp_proto.h" @@ -235,18 +242,18 @@ typedef unsigned long u_long; error "NT requires config.h to be included" # endif /* HAVE_CONFIG_H) */ -#if defined SYS_WINNT # define ifreq _INTERFACE_INFO # define ifr_flags iiFlags # define ifr_addr iiAddress.AddressIn # define ifr_broadaddr iiBroadcastAddress.AddressIn # define ifr_mask iiNetmask.AddressIn -#endif /* SYS_WINNT */ # define isascii __isascii # define isatty _isatty # define mktemp _mktemp -# define getpid GetCurrentProcessId +# if 0 +# define getpid GetCurrentProcessId +# endif # include <windows.h> # include <ws2tcpip.h> # undef interface |
