Bug#764374: libgroove: FTBFS on hurd-i386

[Pino Toscano]

On 2014-10-07 18:42, Svante Signell wrote:
> Source: libgroove
> Version: 4.2.0-1
> Severity: important
> Tags: patch
> User: debian-hurd at lists.debian.org
> Usertags: hurd
>
> Hi,
>
> libgroove fails to build on GNU/Hurd  due to a name clash with OSX, 
> both
> are defining the __MACH__ keyword.

--- a/grooveplayer/osx_time_shim.h	2014-09-25 17:26:09.000000000 +0200
+++ b/grooveplayer/osx_time_shim.h	2014-10-07 18:27:30.000000000 +0200
@@ -8,7 +8,7 @@

  #ifndef GROOVE_MACH_TIME_H_INCLUDED
  #define GROOVE_MACH_TIME_H_INCLUDED
-#ifdef __MACH__
+#if defined(__MACH__) && !defined(__GNU__)

  #include <sys/types.h>
  #include <sys/_types/_timespec.h>

This file is definitely OSX-specific, so the above preprocessor
condition is too loose; it should be __MACH__ and __APPLE__, or simply
just __APPLE__.

-- 
Pino Toscano