From owner-svn-ports-head@freebsd.org Thu Jun 2 18:37:35 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E164B65269; Thu, 2 Jun 2016 18:37:35 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26A2E1CF5; Thu, 2 Jun 2016 18:37:35 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u52IbYSh008546; Thu, 2 Jun 2016 18:37:34 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u52IbYHm008544; Thu, 2 Jun 2016 18:37:34 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201606021837.u52IbYHm008544@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 2 Jun 2016 18:37:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416287 - in head/emulators/qemu-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2016 18:37:35 -0000 Author: sbruno Date: Thu Jun 2 18:37:34 2016 New Revision: 416287 URL: https://svnweb.freebsd.org/changeset/ports/416287 Log: Fixup for macros that conflict with standard C++ function names. PR: 209590 Submitted by: dim@ Added: head/emulators/qemu-devel/files/patch-include_qemu_atomic.h (contents, props changed) Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Thu Jun 2 18:17:00 2016 (r416286) +++ head/emulators/qemu-devel/Makefile Thu Jun 2 18:37:34 2016 (r416287) @@ -3,6 +3,7 @@ PORTNAME= qemu DISTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ PKGNAMESUFFIX= -devel Added: head/emulators/qemu-devel/files/patch-include_qemu_atomic.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-devel/files/patch-include_qemu_atomic.h Thu Jun 2 18:37:34 2016 (r416287) @@ -0,0 +1,28 @@ +--- include/qemu/atomic.h.orig 2016-06-02 18:20:47 UTC ++++ include/qemu/atomic.h +@@ -136,10 +136,12 @@ + /* Provide shorter names for GCC atomic builtins, return old value */ + #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) + #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) ++#ifndef __cplusplus + #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) + #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) ++#endif + + /* And even shorter names that return void. */ + #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) +@@ -330,10 +332,12 @@ + /* Provide shorter names for GCC atomic builtins. */ + #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) + #define atomic_fetch_dec(ptr) __sync_fetch_and_add(ptr, -1) ++#ifndef __cplusplus + #define atomic_fetch_add __sync_fetch_and_add + #define atomic_fetch_sub __sync_fetch_and_sub + #define atomic_fetch_and __sync_fetch_and_and + #define atomic_fetch_or __sync_fetch_and_or ++#endif + #define atomic_cmpxchg __sync_val_compare_and_swap + + /* And even shorter names that return void. */