diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
| commit | c67c02731b6507c5351bca70451441d9a26113ef (patch) | |
| tree | afe8d99e55401fe7955475ab97a497cae2e23ab2 /sysdeps/unix/clock_settime.c | |
| parent | 39762d6a5c0e378f20b28da7450868bfef588fb0 (diff) | |
Updated to fedora-glibc-20070814T0725cvs/fedora-glibc-2_6_90-9
Diffstat (limited to 'sysdeps/unix/clock_settime.c')
| -rw-r--r-- | sysdeps/unix/clock_settime.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c index a93be6349b..f3f62cf990 100644 --- a/sysdeps/unix/clock_settime.c +++ b/sysdeps/unix/clock_settime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1999-2004, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include <ldsodefs.h> -#if HP_TIMING_AVAIL +#if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME /* Clock frequency of the processor. We make it a 64-bit variable because some jokers are already playing with processors with more than 4GHz. */ @@ -33,10 +33,8 @@ static hp_timing_t freq; /* This function is defined in the thread library. */ extern void __pthread_clock_settime (clockid_t clock_id, hp_timing_t offset) __attribute__ ((__weak__)); -#endif -#if HP_TIMING_AVAIL static int hp_timing_settime (clockid_t clock_id, const struct timespec *tp) { |