From owner-svn-src-all@FreeBSD.ORG  Tue Mar 29 17:55:16 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F3071065672;
	Tue, 29 Mar 2011 17:55:16 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CA508FC15;
	Tue, 29 Mar 2011 17:55:16 +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 p2THtGiC036130;
	Tue, 29 Mar 2011 17:55:16 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2THtGcr036128;
	Tue, 29 Mar 2011 17:55:16 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201103291755.p2THtGcr036128@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Tue, 29 Mar 2011 17:55:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220139 - stable/8/lib/libutil
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 29 Mar 2011 17:55:16 -0000

Author: trociny
Date: Tue Mar 29 17:55:15 2011
New Revision: 220139
URL: http://svn.freebsd.org/changeset/base/220139

Log:
  MFC r200035, r219344:
  
  Bring in missing headers and primitive type declarations into <libutil.h> to
  make it work when included by itself.
  
  r200035 (ed):
  
  Make <libutil.h> work when included by itself.
  
  There are several reasons why it didn't work:
  
  - It was missing <sys/cdefs.h> for __BEGIN_DECLS.
  - It uses various primitive types that were not declared.
  
  r219344 (pjd):
  
  expand_number() needs uint64_t, declare it here if not already declared.
  
  Approved by:	kib (co-mentor), pjd (mentor)

Modified:
  stable/8/lib/libutil/libutil.h
Directory Properties:
  stable/8/lib/libutil/   (props changed)

Modified: stable/8/lib/libutil/libutil.h
==============================================================================
--- stable/8/lib/libutil/libutil.h	Tue Mar 29 17:52:45 2011	(r220138)
+++ stable/8/lib/libutil/libutil.h	Tue Mar 29 17:55:15 2011	(r220139)
@@ -39,6 +39,39 @@
 #ifndef _LIBUTIL_H_
 #define	_LIBUTIL_H_
 
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+#ifndef _GID_T_DECLARED
+typedef	__gid_t		gid_t;
+#define	_GID_T_DECLARED
+#endif
+
+#ifndef _INT64_T_DECLARED
+typedef	__int64_t	int64_t;
+#define	_INT64_T_DECLARED
+#endif
+
+#ifndef _UINT64_T_DECLARED
+typedef	__uint64_t	uint64_t;
+#define	_UINT64_T_DECLARED
+#endif
+
+#ifndef _PID_T_DECLARED
+typedef	__pid_t		pid_t;
+#define	_PID_T_DECLARED
+#endif
+
+#ifndef _SIZE_T_DECLARED
+typedef	__size_t	size_t;
+#define	_SIZE_T_DECLARED
+#endif
+
+#ifndef _UID_T_DECLARED
+typedef	__uid_t		uid_t;
+#define	_UID_T_DECLARED
+#endif
+
 #define PROPERTY_MAX_NAME	64
 #define PROPERTY_MAX_VALUE	512