aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-28 05:38:29 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-28 05:38:29 +0000
commit73b6bffcfb54e7d59146746da597161fbcb11b76 (patch)
tree0e1b7d8edb74a50d1ddfd6ddd800426fd7c3fd14 /time
parent8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad (diff)
downloadglibc-73b6bffcfb54e7d59146746da597161fbcb11b76.zip
glibc-73b6bffcfb54e7d59146746da597161fbcb11b76.tar.gz
glibc-73b6bffcfb54e7d59146746da597161fbcb11b76.tar.bz2
Update.
* conform/data/time.h-data: CLK_TCK is not in XPG6. Fix tzname entry. * sysdeps/mach/hurd/bits/time.h: Don't define CLK_TCK for XPG6. * sysdeps/mach/hurd/i386/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/i386/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/time.h: Likewise. * time/time.h: Likewise. * conform/conformtest.pl (@headers): Add complex.h and tgmath.h. * conform/data/complex.h-data: New file. * conform/data/tgmath.h-data: New file. * conform/data/wchar.h-data: Add missing functions. * sysdeps/gnu/bits/utmpx.h: Define RUN_LVL only if __USE_GNU. * conform/data/termios.h-data: Add missing const in tcsetattr() prototype. * posix/sys/wait.h: Include <signal.h> and <sys/resource.h>. Don't define pid_t here. * conform/data/sys/utsname.h-data: Don't provide fixed array sizes.
Diffstat (limited to 'time')
-rw-r--r--time/time.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/time/time.h b/time/time.h
index c7e965d..df61ac7 100644
--- a/time/time.h
+++ b/time/time.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001 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
@@ -42,7 +42,7 @@ __BEGIN_DECLS
# include <bits/time.h>
/* This is the obsolete POSIX.1-1988 name for the same constant. */
-# ifdef __USE_POSIX
+# if defined __USE_POSIX && !defined __USE_XOPEN2K
# ifndef CLK_TCK
# define CLK_TCK CLOCKS_PER_SEC
# endif