From owner-svn-src-all@FreeBSD.ORG  Tue May 22 09:59:50 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 724A8106566C;
	Tue, 22 May 2012 09:59:50 +0000 (UTC)
	(envelope-from harti@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D7C88FC0C;
	Tue, 22 May 2012 09:59:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4M9xoke095554;
	Tue, 22 May 2012 09:59:50 GMT (envelope-from harti@svn.freebsd.org)
Received: (from harti@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4M9xoB2095552;
	Tue, 22 May 2012 09:59:50 GMT (envelope-from harti@svn.freebsd.org)
Message-Id: <201205220959.q4M9xoB2095552@svn.freebsd.org>
From: Hartmut Brandt <harti@FreeBSD.org>
Date: Tue, 22 May 2012 09:59:50 +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: r235780 - 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: Tue, 22 May 2012 09:59:50 -0000

Author: harti
Date: Tue May 22 09:59:49 2012
New Revision: 235780
URL: http://svn.freebsd.org/changeset/base/235780

Log:
  Fix a compilation error with some compilers: __attribute__
  requires two parenthesis for its argument, but instead of using
  __attribute__ directly, use the appropriate __nonnull macro
  from cdefs.h.

Modified:
  head/include/malloc_np.h

Modified: head/include/malloc_np.h
==============================================================================
--- head/include/malloc_np.h	Tue May 22 09:27:57 2012	(r235779)
+++ head/include/malloc_np.h	Tue May 22 09:59:49 2012	(r235780)
@@ -55,13 +55,11 @@ int	mallctlbymib(const size_t *mib, size
 #define	ALLOCM_ERR_OOM		1
 #define	ALLOCM_ERR_NOT_MOVED	2
 
-int	allocm(void **ptr, size_t *rsize, size_t size, int flags)
-    __attribute__(nonnull(1));
+int	allocm(void **ptr, size_t *rsize, size_t size, int flags) __nonnull(1);
 int	rallocm(void **ptr, size_t *rsize, size_t size, size_t extra,
-    int flags) __attribute__(nonnull(1));
-int	sallocm(const void *ptr, size_t *rsize, int flags)
-    __attribute__(nonnull(1));
-int	dallocm(void *ptr, int flags) __attribute__(nonnull(1));
+    int flags) __nonnull(1);
+int	sallocm(const void *ptr, size_t *rsize, int flags) __nonnull(1);
+int	dallocm(void *ptr, int flags) __nonnull(1);
 int	nallocm(size_t *rsize, size_t size, int flags);
 __END_DECLS