merge timecounter branch

This commit is contained in:
kardel 2006-06-07 20:59:28 +00:00
parent 75418af90c
commit d3390a5a9b
6 changed files with 14 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: config.h,v 1.10 2006/05/29 10:04:13 drochner Exp $ */
/* $NetBSD: config.h,v 1.11 2006/06/07 20:59:28 kardel Exp $ */
/* manually edited - check "XXX" comments */
/* config.h. Generated by configure. */
@ -363,7 +363,8 @@
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `isfinite' function. */
/* #undef HAVE_ISFINITE */
/* XXX unused in code - force an error to ensure portability */
#define HAVE_ISFINITE nonsense
/* Define to 1 if you have the `kvm_open' function. */
#define HAVE_KVM_OPEN 1
@ -720,7 +721,8 @@
#define HAVE_SYS_SOCKIO_H 1
/* Define to 1 if you have the <sys/soundcard.h> header file. */
/* #undef HAVE_SYS_SOUNDCARD_H */
/* XXX enable for some/all ports? */
/* #define HAVE_SYS_SOUNDCARD_H 1 */
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@ -927,7 +929,7 @@
/* #undef NO_PARENB_IGNPAR */
/* Default location of crypto key info */
#define NTP_KEYSDIR "/etc/ntp"
#define NTP_KEYSDIR "/etc/ntp" /* XXX fix path */
/* Do we have ntp_{adj,get}time in libc? */
#define NTP_SYSCALLS_LIBC 1
@ -1032,7 +1034,7 @@
/* #undef STREAMS_TLI */
/* canonical system (cpu-vendor-os) string */
#define STR_SYSTEM "i386--netbsd2"
#define STR_SYSTEM "i386--netbsd3" /* XXX use MACHINE_ARCH or similar? */
/* Buggy syscall() (Solaris2.4)? */
/* #undef SYSCALL_BUG */
@ -1068,6 +1070,7 @@
#define ULONG_CONST(a) a ## UL
/* Must we have a CTTY for fsetown? */
/* XXX not needed with current tty handling code */
/* #define USE_FSETOWNCTTY 1 */
/* Can we use SIGPOLL for tty IO? */
@ -1079,8 +1082,8 @@
/* Version number of package */
#define VERSION "4.2.0"
#if 0 /* We'll define this in each Makefile as necessary */
/* ISC: Want IPv6? */
#if 0 /* XXX We'll define this in each Makefile as necessary */
#define WANT_IPV6
#endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2006/02/25 12:04:23 simonb Exp $
# $NetBSD: Makefile,v 1.3 2006/06/07 20:59:28 kardel Exp $
MKPRIVATELIB= yes

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2006/02/25 12:04:24 simonb Exp $
# $NetBSD: Makefile,v 1.7 2006/06/07 20:59:28 kardel Exp $
MKPRIVATELIB= yes

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2006/02/25 12:04:24 simonb Exp $
# $NetBSD: Makefile,v 1.5 2006/06/07 20:59:28 kardel Exp $
MKPRIVATELIB= yes

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2006/05/11 07:15:17 mrg Exp $
# $NetBSD: Makefile,v 1.12 2006/06/07 20:59:28 kardel Exp $
PROG= ntpd
MAN= ntpd.8

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2006/05/11 10:32:37 tron Exp $
# $NetBSD: Makefile,v 1.7 2006/06/07 20:59:28 kardel Exp $
PROG= ntptime
MAN= ntptime.8