From owner-svn-src-all@FreeBSD.ORG  Fri Sep  6 15:38:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 147E4C6;
 Fri,  6 Sep 2013 15:38:41 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0079F28D1;
 Fri,  6 Sep 2013 15:38:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r86FceY4078328;
 Fri, 6 Sep 2013 15:38:40 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r86FceJe078327;
 Fri, 6 Sep 2013 15:38:40 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201309061538.r86FceJe078327@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 6 Sep 2013 15:38:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r255308 - releng/9.2/include
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Sep 2013 15:38:41 -0000

Author: dim
Date: Fri Sep  6 15:38:40 2013
New Revision: 255308
URL: http://svnweb.freebsd.org/changeset/base/255308

Log:
  MFS9 r255306:
  MFC r245428:
  
  Add CLOCK_PROCESS_CPUTIME_ID to <time.h>, to synchronize the CLOCK_*
  values with those in <sys/time.h>.  Otherwise, if a program includes
  <time.h> before <sys/time.h>, the CLOCK_PROCESS_CPUTIME_ID macro never
  gets defined.
  
  Reviewed by:	davidxu
  Approved by:	re (kib)

Modified:
  releng/9.2/include/time.h
Directory Properties:
  releng/9.2/include/   (props changed)

Modified: releng/9.2/include/time.h
==============================================================================
--- releng/9.2/include/time.h	Fri Sep  6 15:19:57 2013	(r255307)
+++ releng/9.2/include/time.h	Fri Sep  6 15:38:40 2013	(r255308)
@@ -105,6 +105,7 @@ typedef	__timer_t	timer_t;
 #define CLOCK_MONOTONIC_FAST	12	/* FreeBSD-specific. */
 #define CLOCK_SECOND	13		/* FreeBSD-specific. */
 #define CLOCK_THREAD_CPUTIME_ID	14
+#define	CLOCK_PROCESS_CPUTIME_ID	15
 #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
 
 #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112