diff options
| author | Adrian Robert | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /src/getloadavg.c | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
| download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/getloadavg.c')
| -rw-r--r-- | src/getloadavg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/getloadavg.c b/src/getloadavg.c index 32d0f41a4a9..c5d78907d82 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c | |||
| @@ -420,7 +420,7 @@ extern int errno; | |||
| 420 | # define host_self mach_host_self | 420 | # define host_self mach_host_self |
| 421 | # endif | 421 | # endif |
| 422 | 422 | ||
| 423 | # ifdef NeXT | 423 | # if defined(NeXT) || defined(RHAPSODY) || defined(DARWIN) || defined(MAC_OSX) |
| 424 | # ifdef HAVE_MACH_MACH_H | 424 | # ifdef HAVE_MACH_MACH_H |
| 425 | # include <mach/mach.h> | 425 | # include <mach/mach.h> |
| 426 | # else | 426 | # else |
| @@ -467,7 +467,7 @@ extern int errno; | |||
| 467 | 467 | ||
| 468 | /* Avoid static vars inside a function since in HPUX they dump as pure. */ | 468 | /* Avoid static vars inside a function since in HPUX they dump as pure. */ |
| 469 | 469 | ||
| 470 | # ifdef NeXT | 470 | # if defined(NeXT) || defined(RHAPSODY) || defined(DARWIN) || defined(MAC_OSX) |
| 471 | static processor_set_t default_set; | 471 | static processor_set_t default_set; |
| 472 | static int getloadavg_initialized; | 472 | static int getloadavg_initialized; |
| 473 | # endif /* NeXT */ | 473 | # endif /* NeXT */ |
| @@ -647,7 +647,8 @@ getloadavg (loadavg, nelem) | |||
| 647 | 647 | ||
| 648 | # endif /* __NetBSD__ */ | 648 | # endif /* __NetBSD__ */ |
| 649 | 649 | ||
| 650 | # if !defined (LDAV_DONE) && defined (NeXT) | 650 | # if !defined (LDAV_DONE) && ( defined (NeXT) || defined(RHAPSODY) \ |
| 651 | || defined(DARWIN) || defined(MAC_OSX) ) | ||
| 651 | # define LDAV_DONE | 652 | # define LDAV_DONE |
| 652 | /* The NeXT code was adapted from iscreen 3.2. */ | 653 | /* The NeXT code was adapted from iscreen 3.2. */ |
| 653 | 654 | ||