CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-19 10:15:48 +02:00
Code Issues Projects Releases Wiki Activity

s/NLIST_STRUCT/HAVE_NLIST_H/. Remove big

Browse Source 
multi-platform `#ifndef NLIST_STRUCT' block.
This commit is contained in:
Jim Meyering
2000-06-18 06:17:54 +00:00
parent 24c39da8d3
commit 890e86b6f9
1 changed files with 6 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/getloadavg.c
View File

@@ -36,9 +36,6 @@
Must be defined unless one of
apollo, DGUX, NeXT, or UMAX is defined;
otherwise, no load average is available.
NLIST_STRUCT Include nlist.h, not a.out.h, and
the nlist n_name element is a pointer,
not an array.
NLIST_NAME_UNION struct nlist has an n_un member, not n_name.
LINUX_LDAV_FILE [__linux__]: File containing load averages.
@@ -308,68 +305,6 @@ extern int errno;
# define LDAV_CVT(n) (((double) (n)) / FSCALE)
# endif
/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters. */
# ifndef NLIST_STRUCT
# ifdef MORE_BSD
# define NLIST_STRUCT
# endif
# ifdef sun
# define NLIST_STRUCT
# endif
# ifdef decstation
# define NLIST_STRUCT
# endif
# ifdef hpux
# define NLIST_STRUCT
# endif
# if defined (_SEQUENT_) || defined (sequent)
# define NLIST_STRUCT
# endif
# ifdef sgi
# define NLIST_STRUCT
# endif
# ifdef SVR4
# define NLIST_STRUCT
# endif
# ifdef sony_news
# define NLIST_STRUCT
# endif
# ifdef OSF_ALPHA
# define NLIST_STRUCT
# endif
# if defined (ardent) && defined (titan)
# define NLIST_STRUCT
# endif
# ifdef tek4300
# define NLIST_STRUCT
# endif
# ifdef butterfly
# define NLIST_STRUCT
# endif
# if defined(alliant) && defined(i860) /* Alliant FX/2800 */
# define NLIST_STRUCT
# endif
# ifdef _AIX
# define NLIST_STRUCT
# endif
# endif /* defined (NLIST_STRUCT) */
# if defined(sgi) || (defined(mips) && !defined(BSD))
# define FIXUP_KERNEL_SYMBOL_ADDR(nl) ((nl)[0].n_value &= ~(1 << 31))
# endif
@@ -412,11 +347,11 @@ extern int errno;
# ifndef VMS
# ifndef __linux__
# ifndef NLIST_STRUCT
# ifndef HAVE_NLIST_H
# include <a.out.h>
# else /* NLIST_STRUCT */
# else /* HAVE_NLIST_H */
# include <nlist.h>
# endif /* NLIST_STRUCT */
# endif /* HAVE_NLIST_H */
# ifdef SUNOS_5
# include <fcntl.h>
@@ -920,10 +855,10 @@ getloadavg (loadavg, nelem)
if (offset == 0)
{
# ifndef sgi
# ifndef NLIST_STRUCT
# ifndef HAVE_NLIST_H
strcpy (nl[0].n_name, LDAV_SYMBOL);
strcpy (nl[1].n_name, "");
# else /* NLIST_STRUCT */
# else /* HAVE_NLIST_H */
# ifdef NLIST_NAME_UNION
nl[0].n_un.n_name = LDAV_SYMBOL;
nl[1].n_un.n_name = 0;
@@ -931,7 +866,7 @@ getloadavg (loadavg, nelem)
nl[0].n_name = LDAV_SYMBOL;
nl[1].n_name = 0;
# endif /* not NLIST_NAME_UNION */
# endif /* NLIST_STRUCT */
# endif /* HAVE_NLIST_H */
# ifndef SUNOS_5
if (