Bug#764374: libgroove: FTBFS on hurd-i386

[Thomas Schwinge]

Hi!

On Tue, 07 Oct 2014 18:42:06 +0200, Svante Signell <svante.signell at gmail.com> wrote:
> 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__)

Instead of masking out the false positive, how about explicitly stating:
»#if defined(__MACH__) && defined(__APPLE__)«.  That's how it is usually
written, if I remember correctly.

That said, just to confirm: it is expected that this file,
osx_time_shim.h, is included even for non-OSX builds?


Grüße,
 Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 472 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20141008/64a5a55b/attachment-0001.sig>