From owner-svn-src-all@FreeBSD.ORG  Wed Mar  4 03:31:10 2009
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 C82FE106564A;
	Wed,  4 Mar 2009 03:31:10 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B74BC8FC19;
	Wed,  4 Mar 2009 03:31:10 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n243VAuE030343;
	Wed, 4 Mar 2009 03:31:10 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n243VAXr030342;
	Wed, 4 Mar 2009 03:31:10 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200903040331.n243VAXr030342@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Wed, 4 Mar 2009 03:31:10 +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: r189349 - head/include
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: Wed, 04 Mar 2009 03:31:11 -0000

Author: das
Date: Wed Mar  4 03:31:10 2009
New Revision: 189349
URL: http://svn.freebsd.org/changeset/base/189349

Log:
  - Add getsubopt and mkdtemp to the POSIX.1-2008 namespace.
  - Add mkstemp to the POSIX.1-2008 and BSD namespaces.
  - Remove mktemp from the XSI namespace.

Modified:
  head/include/stdlib.h

Modified: head/include/stdlib.h
==============================================================================
--- head/include/stdlib.h	Wed Mar  4 03:30:21 2009	(r189348)
+++ head/include/stdlib.h	Wed Mar  4 03:31:10 2009	(r189349)
@@ -164,6 +164,18 @@ int	 setenv(const char *, const char *, 
 int	 unsetenv(const char *);
 #endif
 
+#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
+int	 getsubopt(char **, char *const *, char **);
+#ifndef _MKDTEMP_DECLARED
+char	*mkdtemp(char *);
+#define	_MKDTEMP_DECLARED
+#endif
+#ifndef _MKSTEMP_DECLARED
+int	 mkstemp(char *);
+#define	_MKSTEMP_DECLARED
+#endif
+#endif /* __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE */
+
 /*
  * The only changes to the XSI namespace in revision 6 were the deletion
  * of the ttyslot() and valloc() functions, which FreeBSD never declared
@@ -178,18 +190,13 @@ double	 drand48(void);
 double	 erand48(unsigned short[3]);
 /* char	*fcvt(double, int, int * __restrict, int * __restrict); */
 /* char	*gcvt(double, int, int * __restrict, int * __restrict); */
-int	 getsubopt(char **, char *const *, char **);
 int	 grantpt(int);
 char	*initstate(unsigned long /* XSI requires u_int */, char *, long);
 long	 jrand48(unsigned short[3]);
 char	*l64a(long);
 void	 lcong48(unsigned short[7]);
 long	 lrand48(void);
-#ifndef _MKSTEMP_DECLARED
-int	 mkstemp(char *);
-#define	_MKSTEMP_DECLARED
-#endif
-#ifndef _MKTEMP_DECLARED
+#if !defined(_MKTEMP_DECLARED) && __XSI_VISIBLE <= 600
 char	*mktemp(char *);
 #define	_MKTEMP_DECLARED
 #endif