From owner-p4-projects@FreeBSD.ORG Wed Jun 4 03:12:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 136B81065675; Wed, 4 Jun 2008 03:12:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9A6A106564A for ; Wed, 4 Jun 2008 03:12:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B30138FC19 for ; Wed, 4 Jun 2008 03:12:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m543Cun7079383 for ; Wed, 4 Jun 2008 03:12:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m543Cu6U079381 for perforce@freebsd.org; Wed, 4 Jun 2008 03:12:56 GMT (envelope-from jb@freebsd.org) Date: Wed, 4 Jun 2008 03:12:56 GMT Message-Id: <200806040312.m543Cu6U079381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2008 03:12:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=142857 Change 142857 by jb@freebsd3 on 2008/06/04 03:12:39 Remove the OpenSolaris compatibility defintions to match current/7. Affected files ... .. //depot/projects/dtrace6/src/sys/sys/fcntl.h#4 edit .. //depot/projects/dtrace6/src/sys/sys/stat.h#3 edit .. //depot/projects/dtrace6/src/sys/sys/time.h#4 edit .. //depot/projects/dtrace6/src/sys/sys/types.h#3 edit Differences ... ==== //depot/projects/dtrace6/src/sys/sys/fcntl.h#4 (text+ko) ==== @@ -245,14 +245,6 @@ int flock(int, int); #endif -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE - -#define open64 open - -#endif __END_DECLS #endif ==== //depot/projects/dtrace6/src/sys/sys/stat.h#3 (text+ko) ==== @@ -304,14 +304,6 @@ #endif /* __BSD_VISIBLE */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -#define stat64 stat -#define fstat64 fstat -#endif - #ifndef _KERNEL __BEGIN_DECLS #if __BSD_VISIBLE ==== //depot/projects/dtrace6/src/sys/sys/time.h#4 (text+ko) ==== @@ -314,27 +314,4 @@ #endif /* !_KERNEL */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -/* - * Definitions for commonly used resolutions. - */ -#define SEC 1 -#define MILLISEC 1000 -#define MICROSEC 1000000 -#define NANOSEC 1000000000 - -typedef longlong_t hrtime_t; - -#ifndef _KERNEL -static __inline hrtime_t gethrtime(void) { - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC,&ts); - return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -} -#endif -#endif /* _SOLARIS_C_SOURCE */ - #endif /* !_SYS_TIME_H_ */ ==== //depot/projects/dtrace6/src/sys/sys/types.h#3 (text+ko) ==== @@ -291,36 +291,6 @@ #endif /* !_KERNEL */ /* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -typedef u_int uint_t; -typedef u_char uchar_t; -typedef u_short ushort_t; -typedef u_long ulong_t; - -typedef long long longlong_t; -typedef unsigned long long u_longlong_t; - -typedef off_t off64_t; - -typedef id_t taskid_t; -typedef id_t projid_t; -typedef id_t poolid_t; -typedef id_t zoneid_t; -typedef id_t ctid_t; - -#ifndef _KERNEL -#if defined(__XOPEN_OR_POSIX) -typedef enum { _B_FALSE, _B_TRUE } boolean_t; -#else -typedef enum { B_FALSE, B_TRUE } boolean_t; -#endif /* defined(__XOPEN_OR_POSIX) */ -#endif - -#endif /* _SOLARIS_C_SOURCE */ - -/* * The following are all things that really shouldn't exist in this header, * since its purpose is to provide typedefs, not miscellaneous doodads. */