From owner-svn-src-head@FreeBSD.ORG Tue Feb 1 23:12:13 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E50481065670; Tue, 1 Feb 2011 23:12:13 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D424B8FC25; Tue, 1 Feb 2011 23:12:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p11NCDrp088368; Tue, 1 Feb 2011 23:12:13 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p11NCDHA088366; Tue, 1 Feb 2011 23:12:13 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102012312.p11NCDHA088366@svn.freebsd.org> From: Martin Matuska Date: Tue, 1 Feb 2011 23:12:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218180 - head/sys/cddl/compat/opensolaris/sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Feb 2011 23:12:14 -0000 Author: mm Date: Tue Feb 1 23:12:13 2011 New Revision: 218180 URL: http://svn.freebsd.org/changeset/base/218180 Log: Recommit r218169, enclosing with #ifdef _KERNEL This change is sufficient for the ZFS kernel module. Discussed with: pjd MFC after: 1 week Modified: head/sys/cddl/compat/opensolaris/sys/types.h Modified: head/sys/cddl/compat/opensolaris/sys/types.h ============================================================================== --- head/sys/cddl/compat/opensolaris/sys/types.h Tue Feb 1 22:50:23 2011 (r218179) +++ head/sys/cddl/compat/opensolaris/sys/types.h Tue Feb 1 23:12:13 2011 (r218180) @@ -34,6 +34,12 @@ */ #include + +#ifdef _KERNEL +typedef int64_t clock_t; +#define _CLOCK_T_DECLARED +#endif + #include_next #define MAXNAMELEN 256