Source: libosip2
Version: 4.0.0-1
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd

Hi,

libosip2 4.0.x does not compile on GNU/Hurd [1][2].

The problem is that a Mac OS X-specific code is wrongly used on the
Hurd due to __MACH__ being provided in both OSes (since both use a
Mach-derived kernel).

Easy fix, attached, is to change the conditions from __MACH__ to
__APPLE__.

[1] 
https://buildd.debian.org/status/fetch.php?pkg=libosip2&arch=hurd-i386&ver=4.0.0-1&stamp=1357801678
[2] 
https://buildd.debian.org/status/fetch.php?pkg=libosip2&arch=hurd-i386&ver=4.0.0-2&stamp=1368351707

Thanks,
-- 
Pino
Author: Pino Toscano <p...@debian.org>
Description: Fix build on GNU/Hurd
 GNU/Hurd uses a Mach-based microkernel (gnumach), so __MACH__ is defined too;
 since the code is specific to the Mac OS X variant of Mach, change the
 condition to __APPLE__.

--- a/src/osip2/osip_time.c
+++ b/src/osip2/osip_time.c
@@ -21,7 +21,7 @@
 #include <osip2/osip_time.h>
 #include <osipparser2/osip_port.h>
 
-#ifdef __MACH__
+#ifdef __APPLE__
 #include <mach/clock.h>
 #include <mach/mach.h>
 #endif
@@ -151,7 +151,7 @@ _osip_gettimeofday_realtime (struct time
   return 0;
 }
 
-#elif defined(__MACH__)
+#elif defined(__APPLE__)
 
 int
 osip_gettimeofday (struct timeval *tp, void *tz)

Reply via email to