diff options
| author | Richard M. Stallman | 1998-09-27 07:29:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-09-27 07:29:59 +0000 |
| commit | 432eec292e7466576e54dc6be7e223bb77e706c1 (patch) | |
| tree | 6e8fb83b524df247f98864e2b8703354e006b966 /src | |
| parent | d5844360c8896da06162512dca5c8c26f32d90c7 (diff) | |
| download | emacs-432eec292e7466576e54dc6be7e223bb77e706c1.tar.gz emacs-432eec292e7466576e54dc6be7e223bb77e706c1.zip | |
Treat __GNU__ line NeXT: undefine BSD and FSCALE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/getloadavg.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/getloadavg.c b/src/getloadavg.c index 154f18d7feb..7c1cc8005ed 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c | |||
| @@ -132,6 +132,12 @@ extern int errno; | |||
| 132 | # undef FSCALE | 132 | # undef FSCALE |
| 133 | # endif | 133 | # endif |
| 134 | 134 | ||
| 135 | /* Same issues as for NeXT apply to the HURD-based GNU system. */ | ||
| 136 | # ifdef __GNU__ | ||
| 137 | # undef BSD | ||
| 138 | # undef FSCALE | ||
| 139 | # endif /* __GNU__ */ | ||
| 140 | |||
| 135 | /* Set values that are different from the defaults, which are | 141 | /* Set values that are different from the defaults, which are |
| 136 | set a little farther down with #ifndef. */ | 142 | set a little farther down with #ifndef. */ |
| 137 | 143 | ||
| @@ -528,13 +534,13 @@ static long offset; | |||
| 528 | 534 | ||
| 529 | #if !defined(VMS) && !defined(sgi) && !defined(__linux__) | 535 | #if !defined(VMS) && !defined(sgi) && !defined(__linux__) |
| 530 | static struct nlist nl[2]; | 536 | static struct nlist nl[2]; |
| 531 | #endif | 537 | #endif /* Not VMS or sgi */ |
| 532 | 538 | ||
| 533 | #ifdef SUNOS_5 | 539 | #ifdef SUNOS_5 |
| 534 | static kvm_t *kd; | 540 | static kvm_t *kd; |
| 535 | #endif /* SUNOS_5 */ | 541 | #endif /* SUNOS_5 */ |
| 536 | 542 | ||
| 537 | # endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */ | 543 | #endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */ |
| 538 | 544 | ||
| 539 | /* Put the 1 minute, 5 minute and 15 minute load averages | 545 | /* Put the 1 minute, 5 minute and 15 minute load averages |
| 540 | into the first NELEM elements of LOADAVG. | 546 | into the first NELEM elements of LOADAVG. |