From f7e1f76979dac010f3149c9409b4f77b57783ebf Mon Sep 17 00:00:00 2001 From: Pierrick Koch <pierrick.koch@gmail.com> Date: Thu, 27 Mar 2014 21:04:43 +0100 Subject: [PATCH] [wip/libnabo] update patch before gh/pr --- libnabo/distinfo | 2 +- libnabo/patches/patch-ab | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libnabo/distinfo b/libnabo/distinfo index afebd27c..28b670a9 100644 --- a/libnabo/distinfo +++ b/libnabo/distinfo @@ -2,4 +2,4 @@ SHA1 (libnabo-1.0.4.tar.gz) = 1f71f0f6caf50996e3e61b87b2ac2c05c834518e RMD160 (libnabo-1.0.4.tar.gz) = 5e025ce60f8c773178ce8c1ef7328608a16b63ca Size (libnabo-1.0.4.tar.gz) = 963380 bytes SHA1 (patch-aa) = fe3c4640351d88000aa694055468612a7c25ce43 -SHA1 (patch-ab) = 19ee0764786c7759384c0bca543db1a0d02594a8 +SHA1 (patch-ab) = 00d8739df225f360bf5cbacf02bfa2f0d73f6d17 diff --git a/libnabo/patches/patch-ab b/libnabo/patches/patch-ab index f3ebbdb1..69098913 100644 --- a/libnabo/patches/patch-ab +++ b/libnabo/patches/patch-ab @@ -1,17 +1,16 @@ diff --git tests/helpers.h tests/helpers.h -index 9f0a2f6..edb25d4 100644 +index 9f0a2f6..54209d8 100644 --- tests/helpers.h +++ tests/helpers.h -@@ -155,8 +155,12 @@ namespace boost +@@ -155,7 +155,11 @@ namespace boost mach_port_deallocate(mach_task_self(), cclock); #else struct timespec ts; -+ #ifdef __NetBSD__ -+ clock_gettime(CLOCK_PROF, &ts); -+ #else ++ #ifdef CLOCK_PROCESS_CPUTIME_ID clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); - #endif ++ #else // BSD and old Linux ++ clock_gettime(CLOCK_PROF, &ts); + #endif + #endif return Time(ts.tv_sec) * Time(1000000000) + Time(ts.tv_nsec); } - Time _start_time; -- GitLab