From a0a9bf2e5813002d1348e45bb7c6b0f844f2144c Mon Sep 17 00:00:00 2001 From: John Birrell Date: Sat, 21 Feb 1998 03:20:46 +0000 Subject: [PATCH] Add #ifndef _POSIX_SOURCE around the timecounter definitions which rely on u_int being defined in sys/types.h, but isn't if _POSIX_SOURCE is defined. This fixes the gnu/lib/libstdc++ breakage. I've successfully completed a make world after this and a kernel (without many devices). --- sys/sys/time.h | 4 +++- sys/sys/timetc.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/sys/time.h b/sys/sys/time.h index a726b17c66b7..7fb835a52b5b 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.5 (Berkeley) 5/4/95 - * $Id: time.h,v 1.16 1997/12/28 13:36:09 phk Exp $ + * $Id: time.h,v 1.17 1998/02/20 16:36:16 phk Exp $ */ #ifndef _SYS_TIME_H_ @@ -77,6 +77,7 @@ struct timezone { #define DST_EET 5 /* Eastern European dst */ #define DST_CAN 6 /* Canada */ +#ifndef _POSIX_SOURCE /* * Structure used to interface to the machine dependent hardware * support for timekeeping. @@ -140,6 +141,7 @@ struct timecounter { struct timecounter *other; struct timecounter *tweak; }; +#endif /* Operations on timevals. */ #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h index a726b17c66b7..7fb835a52b5b 100644 --- a/sys/sys/timetc.h +++ b/sys/sys/timetc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.5 (Berkeley) 5/4/95 - * $Id: time.h,v 1.16 1997/12/28 13:36:09 phk Exp $ + * $Id: time.h,v 1.17 1998/02/20 16:36:16 phk Exp $ */ #ifndef _SYS_TIME_H_ @@ -77,6 +77,7 @@ struct timezone { #define DST_EET 5 /* Eastern European dst */ #define DST_CAN 6 /* Canada */ +#ifndef _POSIX_SOURCE /* * Structure used to interface to the machine dependent hardware * support for timekeeping. @@ -140,6 +141,7 @@ struct timecounter { struct timecounter *other; struct timecounter *tweak; }; +#endif /* Operations on timevals. */ #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0