From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCpm4-0006Ph-DK for qemu-devel@nongnu.org; Wed, 08 Jul 2015 09:52:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCplv-0006u3-OY for qemu-devel@nongnu.org; Wed, 08 Jul 2015 09:52:32 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:33867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCplv-0006tX-GY for qemu-devel@nongnu.org; Wed, 08 Jul 2015 09:52:23 -0400 Received: by wgov12 with SMTP id v12so11928968wgo.1 for ; Wed, 08 Jul 2015 06:52:22 -0700 (PDT) Date: Wed, 8 Jul 2015 14:52:18 +0100 From: Stefan Hajnoczi Message-ID: <20150708135218.GD20502@stefanha-thinkpad.redhat.com> References: <1435828789-9647-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8w3uRX/HFJGApMzv" Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL 00/17] Block patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Kevin Wolf , QEMU Developers , Stefan Hajnoczi --8w3uRX/HFJGApMzv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 07, 2015 at 02:47:50PM +0100, Peter Maydell wrote: > On 2 July 2015 at 10:19, Stefan Hajnoczi wrote: > > The following changes since commit d2966f804d70a244f5dde395fc5d22a50ed3= e74e: > > > > Merge remote-tracking branch 'remotes/vivier/tags/pull-m68k-20150629'= into staging (2015-06-29 17:03:20 +0100) > > > > are available in the git repository at: > > > > git://github.com/stefanha/qemu.git tags/block-pull-request > > > > for you to fetch changes up to 764ba3ae511adddfa750db290ac8375d660ca5b9: > > > > block: remove redundant check before g_slist_find() (2015-07-02 10:06= :23 +0100) > > > > ---------------------------------------------------------------- > > > > ---------------------------------------------------------------- > > > > Alberto Garcia (3): > > timer: Move NANOSECONDS_PER_SECONDS to timer.h > > timer: Use a single definition of NSEC_PER_SEC for the whole codebase >=20 > I've just noticed that this clashes with the OSX standard > headers: >=20 > In file included from /Users/pm215/src/qemu/ui/cocoa.m:31: > In file included from /Users/pm215/src/qemu/include/sysemu/sysemu.h:8: > /Users/pm215/src/qemu/include/qemu/timer.h:8:9: warning: > 'NSEC_PER_SEC' macro redefined [-Wmacro-redefined] > #define NSEC_PER_SEC 1000000000LL > ^ > /usr/include/dispatch/time.h:48:9: note: previous definition is here > #define NSEC_PER_SEC 1000000000ull >=20 > Can we use some other constant name, please? Alberto is on vacation so I guess I'm on the hook to fix this. --8w3uRX/HFJGApMzv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVnSsSAAoJEJykq7OBq3PIedwIAKPjZJPT2P4FuQOaoEEaMbXC HF5LYER560MHNCESM2SAgOJXDI/1GGDCY2Z/afGuzwwCGMfKIr1fiWC/+m0sPsRZ u6sox1HaJxsEvXpUneM8e4XeY8EFHkXW6DIpwoKy79aSs9WDoUqAT7pHE8yHKf5X snskpESvTmVYl/g14k9OG+LUGIbCf5bNgGoEPZ1uXXein9NHb+JrZ4v8yeMx37g/ M2ta9QG13i1qNMpWUd0ciHBZ0aCggrX2f8/JJC9Q4RpDl6Kv5iHLyeOfaW9jSPoq 54z77jfd6FtcOa6e9l7QD8qDYV4rm0kZ0SOIiApOfzN8+Tu4kpPN8aicRe+omLc= =p2a5 -----END PGP SIGNATURE----- --8w3uRX/HFJGApMzv--