[Qemu-commits] [qemu/qemu] 13566f: timer: rename NSEC_PER_SEC due to Mac OS X header ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 13566fe3e584e7b14a6f45246976b91677dc2a77
      
https://github.com/qemu/qemu/commit/13566fe3e584e7b14a6f45246976b91677dc2a77
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/ppc/ppc.c
    M hw/ppc/spapr_rtc.c
    M hw/timer/mc146818rtc.c
    M hw/usb/hcd-ehci.c
    M include/qemu/timer.h
    M tests/rtl8139-test.c
    M tests/test-throttle.c
    M tests/wdt_ib700-test.c
    M util/throttle.c

  Log Message:
  -----------
  timer: rename NSEC_PER_SEC due to Mac OS X header clash

Commit e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9 ("timer: Use a single
definition of NSEC_PER_SEC for the whole codebase") renamed
NANOSECONDS_PER_SECOND to NSEC_PER_SEC.

On Mac OS X there is a <dispatch/time.h> system header which also
defines NSEC_PER_SEC.  This causes compiler warnings.

Let's use the old name instead.  It's longer but it doesn't clash.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>