On Tue, Jul 07, 2015 at 02:47:50PM +0100, Peter Maydell wrote: > On 2 July 2015 at 10:19, Stefan Hajnoczi <stefa...@redhat.com> wrote: > > The following changes since commit d2966f804d70a244f5dde395fc5d22a50ed3e74e: > > > > 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 > > I've just noticed that this clashes with the OSX standard > headers: > > 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 > > Can we use some other constant name, please?
Alberto is on vacation so I guess I'm on the hook to fix this.
pgpJilB_LT2NX.pgp
Description: PGP signature
