diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-03-27 13:22:15 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-03-27 13:22:15 +0000 |
| commit | ca1bbff0ee443807a36d8c7bf798672589ac37f6 (patch) | |
| tree | 5c44adf6728cbd3c1c4cf17f106a8c7801206be2 /libc/sysdeps/unix/sysv/linux/adjtime.c | |
| parent | 1bc40ce17eb32360b2e6e8752e0c5a4ef729e375 (diff) | |
| download | eglibc2-ca1bbff0ee443807a36d8c7bf798672589ac37f6.tar.gz | |
Merge changes between r5247 and r5678 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@5679 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/adjtime.c')
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/adjtime.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/adjtime.c b/libc/sysdeps/unix/sysv/linux/adjtime.c index 202bb1448..ebd214970 100644 --- a/libc/sysdeps/unix/sysv/linux/adjtime.c +++ b/libc/sysdeps/unix/sysv/linux/adjtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007 +/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -71,14 +71,16 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv) return -1; } tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L; + tntx.modes = ADJ_OFFSET_SINGLESHOT; + } + else + { #ifdef ADJ_OFFSET_SS_READ tntx.modes = ADJ_OFFSET_SS_READ; #else - tntx.modes = ADJ_OFFSET_SINGLESHOT; + tntx.modes = 0; #endif } - else - tntx.modes = 0; #if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ again: |