update from GNU libc

[gnulib.git] / lib / getloadavg.c

diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 6209fef..db2cdfe 100644 (file)
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -149,6 +149,10 @@ extern int errno;
 #define decstation
 #endif
 
+#if defined (__SVR4) && !defined (SVR4)
+#define SVR4
+#endif
+
 #if (defined(sun) && defined(SVR4)) || defined (SOLARIS2)
 #define SUNOS_5
 #endif
@@ -362,7 +366,7 @@ extern int errno;
 #define KERNEL_FILE "/hp-ux"
 #endif
 
-#if !defined(KERNEL_FILE) && (defined(_SEQUENT_) || defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || defined(SVR4) || (defined (ardent) && defined (titan)))
+#if !defined(KERNEL_FILE) && (defined(_SEQUENT_) || defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || (defined (ardent) && defined (titan)))
 #define KERNEL_FILE "/unix"
 #endif
 
@@ -390,6 +394,7 @@ extern int errno;
 #ifdef LOAD_AVE_TYPE
 
 #ifndef VMS
+#ifndef __linux__
 #ifndef NLIST_STRUCT
 #include <a.out.h>
 #else /* NLIST_STRUCT */
@@ -409,6 +414,7 @@ extern int errno;
 #ifndef LDAV_SYMBOL
 #define LDAV_SYMBOL "_avenrun"
 #endif /* LDAV_SYMBOL */
+#endif /* __linux__ */
 
 #else /* VMS */
 
@@ -495,7 +501,7 @@ static int getloadavg_initialized;
 /* Offset in kmem to seek to read load average, or 0 means invalid.  */
 static long offset;
 
-#if !defined(VMS) && !defined(sgi)
+#if !defined(VMS) && !defined(sgi) && !defined(__linux__)
 static struct nlist nl[2];
 #endif /* Not VMS or sgi */