2 files changed, 19 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b357aa2bb9..76dbe853d89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/intel386.h: Undo reactoring from previous change.
+
 2008-07-16  Jason Rumney  <jasonr@gnu.org>
 
         * w32gui.h: Repeat 26 June changes lost by last change.
@@ -58,8 +62,11 @@
         Remove boilerplate comments.
         * lisp.h (PNTR_COMPARISON_TYPE): Define it unconditionally.
 
+        * m/intel386.h (DATA_SEG_BITS): Remove definitions, only used on
+        USG systems which do not use DATA_SEG_BITS.
+        Refactor code.  Remove boilerplate comments.
+
         * m/ibms390.h:
-        * m/intel386.h:
         * m/m68k.h:
         * s/bsd-common.h:
         * s/cygwin.h:
diff --git a/src/m/intel386.h b/src/m/intel386.h
index a9349be65ef..7b8f5bd4ec6 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -54,6 +54,7 @@ NOTE-END */
 
 #define DOT_GLOBAL_START
 
+#ifdef SOLARIS2
 /* Data type of load average, as read out of kmem.  */
 #define LOAD_AVE_TYPE long
 
@@ -61,16 +62,25 @@ NOTE-END */
 /* This is totally uncalibrated. */
 #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
 
-#ifdef SOLARIS2
 /* J.W.Hawtin@lut.ac.uk say Solaris 2.4 as well as Solaris 2.1 on X86
    requires -lkvm as well.
    And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5.  */
 #define LIBS_MACHINE -lkvm -lelf
+
 /* configure thinks solaris X86 has gethostname, but it does not work,
    so undefine it.  */
 #undef HAVE_GETHOSTNAME
+
 #else /* not SOLARIS2 */
 #ifdef USG5_4 /* Older USG systems do not support the load average.  */
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+/* This is totally uncalibrated. */
+
+#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
 #define FSCALE 256.0
 #endif
 #endif /* not SOLARIS2 */