summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/i386
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 /sysdeps/unix/sysv/linux/i386
parent8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad (diff)
downloadglibc-73b6bffcfb54e7d59146746da597161fbcb11b76.tar.gz
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 'sysdeps/unix/sysv/linux/i386')
-rw-r--r--sysdeps/unix/sysv/linux/i386/bits/time.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/bits/time.h b/sysdeps/unix/sysv/linux/i386/bits/time.h
index 99b3191f38..a6e7f5e471 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/time.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/time.h
@@ -1,5 +1,5 @@
/* System-dependent timing definitions. Linux/x86 version.
- Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 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
@@ -33,7 +33,7 @@
XSI-conformant systems. */
# define CLOCKS_PER_SEC 1000000l
-# ifndef __STRICT_ANSI__
+# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
# include <bits/types.h>