From fd4b49373e27271d64d29752090f46ad2b3f3bea Mon Sep 17 00:00:00 2001
From: wollman <wollman@FreeBSD.org>
Date: Thu, 29 Sep 1994 23:44:43 +0000
Subject: Merged changes from the vendor branch.  NB: this will NOT compile
 until after the NEXT commit.

---
 usr.sbin/xntpd/util/tickadj.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/xntpd/util/tickadj.c')

diff --git a/usr.sbin/xntpd/util/tickadj.c b/usr.sbin/xntpd/util/tickadj.c
index dcf6935..796d822 100644
--- a/usr.sbin/xntpd/util/tickadj.c
+++ b/usr.sbin/xntpd/util/tickadj.c
@@ -7,8 +7,12 @@
  */
 #include <stdio.h>
 
+#if !defined(SYS_VAX) && !defined(SYS_BSD)
+#include <unistd.h>
+#endif /* SYS_VAX */
+
 #ifdef SYS_LINUX
-#include <sys/timex.h>
+#include "sys/timex.h"
 
 struct timex txc;
 
@@ -42,7 +46,9 @@ main(int argc, char ** argv)
 #else /* not Linux... kmem tweaking: */
 
 #include <sys/types.h>
+#ifndef SYS_BSD
 #include <sys/file.h>
+#endif
 #include <sys/stat.h>
 
 #if defined(SYS_AUX3) || defined(SYS_AUX2)
@@ -69,7 +75,7 @@ main(int argc, char ** argv)
 #endif
 #endif
 
-#ifdef SYS_PTX
+#if defined(SYS_PTX) || defined(SYS_IX86OSF1)
 #define L_SET SEEK_SET
 #endif
 
@@ -559,7 +565,7 @@ readvar(fd, off, var)
 	}
 	if (i != sizeof(int)) {
 		(void) fprintf(stderr, "%s: read expected %d, got %d\n",
-		    progname, sizeof(int), i);
+		    progname, (int)sizeof(int), i);
 		exit(1);
 	}
 }
-- 
cgit v1.1