X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsys_times.in.h;h=57f3a7209d5145c276234ea9a7bcf49bef7b89a8;hb=6d62642d28119a6eed354809c7686bdd3b20e243;hp=31ab4ce37c594205c835d12f4a4fb59dd81ba35e;hpb=f2f428037cd5dcf93c4cc8cfacf4dd92f0f250bd;p=gnulib.git

diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h
index 31ab4ce37..57f3a7209 100644
--- a/lib/sys_times.in.h
+++ b/lib/sys_times.in.h
@@ -1,5 +1,5 @@
 /* Provide a sys/times.h header file.
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,13 +32,16 @@
 
 # define _GL_SYS_TIMES_H
 
-/* Get clock_t. */
-# include <time.h>
-
-/* The definition of GL_LINK_WARNING is copied here.  */
+/* Get clock_t.
+   But avoid namespace pollution on glibc systems.  */
+# ifndef __GLIBC__
+#  include <time.h>
+# endif
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
 
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
 # ifdef __cplusplus
 extern "C" {
 # endif
@@ -61,10 +64,10 @@ extern "C" {
 #  endif
 # elif defined GNULIB_POSIXCHECK
 #  undef times
-#  define times(s)                                              \
-  (GL_LINK_WARNING ("times is unportable - "                    \
-                    "use gnulib module times for portability"), \
-   times (s))
+#  if HAVE_RAW_DECL_TIMES
+_GL_WARN_ON_USE (times, "times is unportable - "
+                 "use gnulib module times for portability");
+#  endif
 # endif
 
 # ifdef __cplusplus