revert changes to getloadavg.c

2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 63495ca08fc..fa6fe1a1cbd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 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
         set here with ns_appdir, ns_appresdir, ns_appbindir, ns_appsrc) set
         from configure.
diff --git a/src/getloadavg.c b/src/getloadavg.c
index c5d78907d82..32d0f41a4a9 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -420,7 +420,7 @@ extern int errno;
 #  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 @@ extern int errno;
 
 /* 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 @@ getloadavg (loadavg, nelem)
 
 # 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.  */