From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 9 Jan 2003 01:30:34 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/backroom/ntp-stable
X-Git-Tag: NTP_4_1_73~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ab1717f8bf481d5015dfd2daca3e355c1f1124;p=thirdparty%2Fntp.git

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

bk: 3e1cd0ba7ynoxMLx9Fg8GKznl9ZmLA
---

16ab1717f8bf481d5015dfd2daca3e355c1f1124
diff --cc include/ntp_machine.h
index ef1e16f57b,46ef19a7e5..303b87e98e
--- a/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));