Fix getloadavg.c on Tru64 4.0D.

* lib/getloadavg.c
[defined (__osf__) && (defined (__alpha) || defined (__alpha__)]:
Undef `sys' after including sys/table.h, for Tru64 4.0D.

diff --git a/ChangeLog b/ChangeLog
index 2bca4636180237cb56cd9d15f802ffaa0891f313..4801d215c61e7090aff49865cb5fab3bfddab6ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * lib/getloadavg.c
+       [defined (__osf__) && (defined (__alpha) || defined (__alpha__)]:
+       Undef `sys' after including sys/table.h, for Tru64 4.0D.
+
        * tests/test-i-ring.c: Work for C89.
 
 2007-10-22  Bruno Haible  <bruno@clisp.org>

diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index ac6cd0f04dd4cec0bdab321ade850878e9fd4993..eac84839b4f22caab0c1f308ffe36e8a5b1c9e70 100644 (file)
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -1,7 +1,7 @@
 /* Get the system load averages.
 
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994,
-   1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+   1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
@@ -186,6 +186,8 @@
 #  include <sys/socket.h>
 #  include <net/route.h>
 #  include <sys/table.h>
+/* Tru64 4.0D's table.h redefines sys */
+#  undef sys
 # endif
 
 # if defined (__osf__) && (defined (mips) || defined (__mips__))