Mercurial > emacs
changeset 96772:ade33f1b986e
revert changes to getloadavg.c
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 17 Jul 2008 18:33:05 +0000 |
| parents | d92ec7333164 |
| children | 8b4d07d37cc5 |
| files | src/ChangeLog src/getloadavg.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 17 18:28:58 2008 +0000 +++ b/src/ChangeLog Thu Jul 17 18:33:05 2008 +0000 @@ -1,3 +1,7 @@ +2008-07-17 Adrian Robert <Adrian.B.Robert@gmail.com> + + * getloadavg.c: Revert last change (2008-07-15). + 2008-07-17 Adrian Robert <Adrian.B.Robert@gmail.com> * Makefile.in: Replace emacsapp, emacsbindir, emacsappsrc variables
--- a/src/getloadavg.c Thu Jul 17 18:28:58 2008 +0000 +++ b/src/getloadavg.c Thu Jul 17 18:33:05 2008 +0000 @@ -420,7 +420,7 @@ # define host_self mach_host_self # endif -# if defined(NeXT) || defined(RHAPSODY) || defined(DARWIN) || defined(MAC_OSX) +# ifdef NeXT # ifdef HAVE_MACH_MACH_H # include <mach/mach.h> # else @@ -467,7 +467,7 @@ /* Avoid static vars inside a function since in HPUX they dump as pure. */ -# if defined(NeXT) || defined(RHAPSODY) || defined(DARWIN) || defined(MAC_OSX) +# ifdef NeXT static processor_set_t default_set; static int getloadavg_initialized; # endif /* NeXT */ @@ -647,8 +647,7 @@ # endif /* __NetBSD__ */ -# if !defined (LDAV_DONE) && ( defined (NeXT) || defined(RHAPSODY) \ - || defined(DARWIN) || defined(MAC_OSX) ) +# if !defined (LDAV_DONE) && defined (NeXT) # define LDAV_DONE /* The NeXT code was adapted from iscreen 3.2. */