From owner-svn-src-head@FreeBSD.ORG  Wed Mar  4 03:31:52 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 2BC31106566C;
	Wed,  4 Mar 2009 03:31:52 +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 1AB958FC1A;
	Wed,  4 Mar 2009 03:31:52 +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 n243Vp0L030393;
	Wed, 4 Mar 2009 03:31:51 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n243Vpmn030392;
	Wed, 4 Mar 2009 03:31:51 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200903040331.n243Vpmn030392@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Wed, 4 Mar 2009 03:31:51 +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: r189350 - head/include
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Mar 2009 03:31:52 -0000

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

Log:
  - Remove bcmp, bcopy, bzero, index, and rindex from the POSIX.1-2008
    namespace.
  - Add ffs to the XSI namespace.

Modified:
  head/include/strings.h

Modified: head/include/strings.h
==============================================================================
--- head/include/strings.h	Wed Mar  4 03:31:10 2009	(r189349)
+++ head/include/strings.h	Wed Mar  4 03:31:51 2009	(r189350)
@@ -38,10 +38,14 @@ typedef	__size_t	size_t;
 #endif
 
 __BEGIN_DECLS
+#if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112
 int	 bcmp(const void *, const void *, size_t) __pure;	/* LEGACY */
 void	 bcopy(const void *, void *, size_t);			/* LEGACY */
 void	 bzero(void *, size_t);					/* LEGACY */
+#endif
+#if __XSI_VISIBLE
 int	 ffs(int) __pure2;
+#endif
 #ifdef __BSD_VISIBLE
 int	 ffsl(long) __pure2;
 int	 ffsll(long long) __pure2;
@@ -49,8 +53,10 @@ int	 fls(int) __pure2;
 int	 flsl(long) __pure2;
 int	 flsll(long long) __pure2;
 #endif
+#if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112
 char	*index(const char *, int) __pure;			/* LEGACY */
 char	*rindex(const char *, int) __pure;			/* LEGACY */
+#endif
 int	 strcasecmp(const char *, const char *) __pure;
 int	 strncasecmp(const char *, const char *, size_t) __pure;
 __END_DECLS