about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/bits/time.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-02-26 13:17:27 -0500
committerUlrich Drepper <drepper@gmail.com>2012-02-26 13:17:27 -0500
commit4efeffc1d583597e4f52985b9747269e47b754e2 (patch)
tree65bb598457542a0de30c60646173679c5ea42557 /sysdeps/unix/sysv/linux/bits/time.h
parentc20105c398036c4fbeb99f8480ab84077a0f6f2c (diff)
downloadglibc-4efeffc1d583597e4f52985b9747269e47b754e2.tar.gz
glibc-4efeffc1d583597e4f52985b9747269e47b754e2.tar.xz
glibc-4efeffc1d583597e4f52985b9747269e47b754e2.zip
Fix up POSIX testing in conformtest
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits/time.h')
-rw-r--r--sysdeps/unix/sysv/linux/bits/time.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index 977155c4c2..7805ce7e01 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -1,5 +1,5 @@
 /* System-dependent timing definitions.  Linux version.
-   Copyright (C) 1996,1997,1999-2003,2010,2011 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1999-2003,2010,2011,2012 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
@@ -47,7 +47,8 @@ struct timeval
    XSI-conformant systems. */
 #  define CLOCKS_PER_SEC  1000000l
 
-#  if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
+#  if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \
+   && !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>