From owner-svn-src-stable-7@FreeBSD.ORG  Thu Dec 17 19:54:32 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 949BF1065676;
	Thu, 17 Dec 2009 19:54:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8435B8FC1F;
	Thu, 17 Dec 2009 19:54:32 +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 nBHJsWA7048319;
	Thu, 17 Dec 2009 19:54:32 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBHJsWHL048317;
	Thu, 17 Dec 2009 19:54:32 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912171954.nBHJsWHL048317@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 17 Dec 2009 19:54:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200646 - stable/7/sys/sys
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2009 19:54:32 -0000

Author: jhb
Date: Thu Dec 17 19:54:32 2009
New Revision: 200646
URL: http://svn.freebsd.org/changeset/base/200646

Log:
  Partial merge of 187961 to ease compilation of 8.x code on 7:
  Add a function attribute called `__malloc_like'.

Modified:
  stable/7/sys/sys/cdefs.h

Modified: stable/7/sys/sys/cdefs.h
==============================================================================
--- stable/7/sys/sys/cdefs.h	Thu Dec 17 19:53:16 2009	(r200645)
+++ stable/7/sys/sys/cdefs.h	Thu Dec 17 19:54:32 2009	(r200646)
@@ -224,8 +224,10 @@
 #endif
 
 #if __GNUC_PREREQ__(2, 96)
+#define	__malloc_like	__attribute__((__malloc__))
 #define	__pure		__attribute__((__pure__))
 #else
+#define	__malloc_like
 #define	__pure
 #endif