[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-78-ga02a606

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=a02a606716d782e0351e5abc5b0f70ebc3d18ac8

The branch, stable-2.0 has been updated
       via  a02a606716d782e0351e5abc5b0f70ebc3d18ac8 (commit)
      from  19761af161942ef18aa2b7891cbf718fc5be5945 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a02a606716d782e0351e5abc5b0f70ebc3d18ac8
Author: Andy Wingo <address@hidden>
Date:   Fri May 20 17:41:06 2011 +0200

    clocktime freebsd portability
    
    * libguile/stime.c (HAVE_POSIX_CPUTIME): Hack around buggy FreeBSD
      implementation of _POSIX_CPUTIME.

-----------------------------------------------------------------------

Summary of changes:
 libguile/stime.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libguile/stime.c b/libguile/stime.c
index 1c4f407..dda82e7 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -142,7 +142,11 @@ get_internal_real_time_posix_timer (void)
      ts.tv_nsec - posix_real_time_base.tv_nsec);
 }
 
-#ifdef _POSIX_CPUTIME
+#if defined _POSIX_CPUTIME && defined CLOCK_PROCESS_CPUTIME_ID
+/* You see, FreeBSD defines _POSIX_CPUTIME but not
+   CLOCK_PROCESS_CPUTIME_ID.  */
+#define HAVE_POSIX_CPUTIME 1
+
 struct timespec posix_run_time_base;
 
 static long
@@ -847,7 +851,7 @@ scm_init_stime()
   if (clock_gettime (CLOCK_REALTIME, &posix_real_time_base) == 0)
     get_internal_real_time = get_internal_real_time_posix_timer;
 
-#ifdef _POSIX_CPUTIME
+#ifdef HAVE_POSIX_CPUTIME
   {
     clockid_t dummy;
     
@@ -859,7 +863,7 @@ scm_init_stime()
     else
       errno = 0;
   }
-#endif /* _POSIX_CPUTIME */
+#endif /* HAVE_POSIX_CPUTIME */
 #endif /* HAVE_CLOCKTIME */
 
   /* If needed, init and use gettimeofday timer. */


hooks/post-receive
-- 
GNU Guile