summaryrefslogtreecommitdiff
path: root/src/m
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-06-13 21:10:43 +0000
committerRichard M. Stallman <rms@gnu.org>1994-06-13 21:10:43 +0000
commit5d32abe64af5ba459ccef53da722519243deafcf (patch)
treef000613f41099c77a1677a17b231ee41951604ba /src/m
parentbb0807e75ac38b11737dd75dd38bc633cbfa5c55 (diff)
downloademacs-5d32abe64af5ba459ccef53da722519243deafcf.tar.gz
Fix previous change.
Diffstat (limited to 'src/m')
-rw-r--r--src/m/intel386.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/m/intel386.h b/src/m/intel386.h
index c0c7608e38a..13899b04b6b 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -108,17 +108,6 @@ NOTE-END */
#define FSCALE 256.0 /* determined by experimentation... */
#endif
-#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
#ifdef SOLARIS2
/* Data type of load average, as read out of kmem. */
@@ -133,7 +122,20 @@ NOTE-END */
X86 has gethostname but it does not work so undefine it. */
#define LIBS_MACHINE -lkvm
#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 */
/* Define CANNOT_DUMP on machines where unexec does not work.
Then the function dump-emacs will not be defined