[Pkg-haskell-commits] darcs: haskell-clock: Hurd compat patch by Pino Toscano (Closes: #784685)

[Joachim Breitner]

Thu May  7 19:09:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Hurd compat patch by Pino Toscano (Closes: #784685)

    M ./changelog +6
    A ./patches/
    A ./patches/hurd.diff
    A ./patches/series

Thu May  7 19:09:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Hurd compat patch by Pino Toscano (Closes: #784685)
diff -rN -u old-haskell-clock/changelog new-haskell-clock/changelog
--- old-haskell-clock/changelog	2015-05-07 19:13:47.452866798 +0000
+++ new-haskell-clock/changelog	2015-05-07 19:13:47.464866796 +0000
@@ -1,3 +1,9 @@
+haskell-clock (0.4.1.3-3) UNRELEASED; urgency=medium
+
+  * Hurd compat patch by Pino Toscano (Closes: #784685)
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 07 May 2015 21:08:44 +0200
+
 haskell-clock (0.4.1.3-2) unstable; urgency=medium
 
   * Upload to unstable
diff -rN -u old-haskell-clock/patches/hurd.diff new-haskell-clock/patches/hurd.diff
--- old-haskell-clock/patches/hurd.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-clock/patches/hurd.diff	2015-05-07 19:13:47.456866798 +0000
@@ -0,0 +1,30 @@
+--- a/csec/clock.c
++++ b/csec/clock.c
+@@ -119,7 +119,7 @@ void clock_readres_threadtime(long* t)
+ // ***********************
+ 
+ #include <time.h>
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+   #include <mach/clock.h>
+   #include <mach/mach.h>
+   #define CLOCK_ID_T clock_id_t
+@@ -138,7 +138,7 @@ void clock_readres_threadtime(long* t)
+ 
+ void time_(CLOCK_ID_T clock, long* t)
+ {
+-  #ifdef __MACH__
++  #if defined(__MACH__) && defined(__APPLE__)
+     // OS X does not have clock_gettime, use clock_get_time
+     // see http://stackoverflow.com/questions/11680461/monotonic-clock-on-osx
+     clock_serv_t cclock;
+@@ -188,7 +188,7 @@ void clock_readtime_threadtime(long* t)
+ 
+ void res_(CLOCK_ID_T clock, long* t)
+ {
+-  #ifdef __MACH__
++  #if defined(__MACH__) && defined(__APPLE__)
+     clock_serv_t cclock;
+     int nsecs;
+     mach_msg_type_number_t count;
+
\ Kein Zeilenumbruch am Dateiende.
diff -rN -u old-haskell-clock/patches/series new-haskell-clock/patches/series
--- old-haskell-clock/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-clock/patches/series	2015-05-07 19:13:47.456866798 +0000
@@ -0,0 +1 @@
+hurd.diff