Mercurial > emacs
changeset 96738:ef171d1fe0fc
Undo reactoring from previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 16 Jul 2008 14:56:13 +0000 |
| parents | 4b22b41c7dd8 |
| children | 77c53729bbb6 |
| files | src/ChangeLog src/m/intel386.h |
| diffstat | 2 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 16 10:06:08 2008 +0000 +++ b/src/ChangeLog Wed Jul 16 14:56:13 2008 +0000 @@ -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:
--- a/src/m/intel386.h Wed Jul 16 10:06:08 2008 +0000 +++ b/src/m/intel386.h Wed Jul 16 14:56:13 2008 +0000 @@ -54,6 +54,7 @@ #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 @@ /* 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 */