diff options
| author | Richard M. Stallman | 1994-06-13 21:10:43 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-06-13 21:10:43 +0000 |
| commit | 5d32abe64af5ba459ccef53da722519243deafcf (patch) | |
| tree | f000613f41099c77a1677a17b231ee41951604ba /src | |
| parent | bb0807e75ac38b11737dd75dd38bc633cbfa5c55 (diff) | |
| download | emacs-5d32abe64af5ba459ccef53da722519243deafcf.tar.gz emacs-5d32abe64af5ba459ccef53da722519243deafcf.zip | |
Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/m/intel386.h | 24 |
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 */ | |||
| 108 | #define FSCALE 256.0 /* determined by experimentation... */ | 108 | #define FSCALE 256.0 /* determined by experimentation... */ |
| 109 | #endif | 109 | #endif |
| 110 | 110 | ||
| 111 | #ifdef USG5_4 /* Older USG systems do not support the load average. */ | ||
| 112 | /* Data type of load average, as read out of kmem. */ | ||
| 113 | |||
| 114 | #define LOAD_AVE_TYPE long | ||
| 115 | |||
| 116 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | ||
| 117 | /* This is totally uncalibrated. */ | ||
| 118 | |||
| 119 | #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) | ||
| 120 | #define FSCALE 256.0 | ||
| 121 | #endif | ||
| 122 | 111 | ||
| 123 | #ifdef SOLARIS2 | 112 | #ifdef SOLARIS2 |
| 124 | /* Data type of load average, as read out of kmem. */ | 113 | /* Data type of load average, as read out of kmem. */ |
| @@ -133,7 +122,20 @@ NOTE-END */ | |||
| 133 | X86 has gethostname but it does not work so undefine it. */ | 122 | X86 has gethostname but it does not work so undefine it. */ |
| 134 | #define LIBS_MACHINE -lkvm | 123 | #define LIBS_MACHINE -lkvm |
| 135 | #undef HAVE_GETHOSTNAME | 124 | #undef HAVE_GETHOSTNAME |
| 125 | |||
| 126 | #else /* not SOLARIS2 */ | ||
| 127 | #ifdef USG5_4 /* Older USG systems do not support the load average. */ | ||
| 128 | /* Data type of load average, as read out of kmem. */ | ||
| 129 | |||
| 130 | #define LOAD_AVE_TYPE long | ||
| 131 | |||
| 132 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | ||
| 133 | /* This is totally uncalibrated. */ | ||
| 134 | |||
| 135 | #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) | ||
| 136 | #define FSCALE 256.0 | ||
| 136 | #endif | 137 | #endif |
| 138 | #endif /* not SOLARIS2 */ | ||
| 137 | 139 | ||
| 138 | /* Define CANNOT_DUMP on machines where unexec does not work. | 140 | /* Define CANNOT_DUMP on machines where unexec does not work. |
| 139 | Then the function dump-emacs will not be defined | 141 | Then the function dump-emacs will not be defined |