Mercurial > emacs
changeset 96929:5efe4b10d2b2
* s/usg5-4.h (ADDR_CORRECT): Remove, unused.
* unexaix.c (ADDR_CORRECT): Remove conditional, the only user
defines it.
* unexec.c (ADDR_CORRECT): Define unconditionally.
* m/ibmrs6000.h (C_SWITCH_MACHINE): Remove.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 23 Jul 2008 08:29:24 +0000 |
| parents | 52474504bf47 |
| children | 540cd63e783a |
| files | admin/CPP-DEFINES src/ChangeLog src/m/ibmrs6000.h src/s/usg5-4.h src/unexaix.c src/unexec.c |
| diffstat | 6 files changed, 7 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/CPP-DEFINES Wed Jul 23 08:02:27 2008 +0000 +++ b/admin/CPP-DEFINES Wed Jul 23 08:29:24 2008 +0000 @@ -52,7 +52,6 @@ ** Defines from src/m/*.h and src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/[sm]/*.h. -ADDR_CORRECT AIX AMPERSAND_FULL_NAME A_TEXT_OFFSET
--- a/src/ChangeLog Wed Jul 23 08:02:27 2008 +0000 +++ b/src/ChangeLog Wed Jul 23 08:29:24 2008 +0000 @@ -1,5 +1,12 @@ 2008-07-23 Dan Nicolaescu <dann@ics.uci.edu> + * s/usg5-4.h (ADDR_CORRECT): Remove, unused. + * unexaix.c (ADDR_CORRECT): Remove conditional, the only user + defines it. + * unexec.c (ADDR_CORRECT): Define unconditionally. + + * m/ibmrs6000.h (C_SWITCH_MACHINE): Remove. + * unexec.c: Remove code depending on !COFF and USG, the file is not used for such systems.
--- a/src/m/ibmrs6000.h Wed Jul 23 08:02:27 2008 +0000 +++ b/src/m/ibmrs6000.h Wed Jul 23 08:29:24 2008 +0000 @@ -83,9 +83,6 @@ #define LIBS_MACHINE #endif /* USG5_4 */ -#undef ADDR_CORRECT -#define ADDR_CORRECT(x) ((int)(x)) - #define START_FILES /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/ #define BROKEN_FIONREAD
--- a/src/s/usg5-4.h Wed Jul 23 08:02:27 2008 +0000 +++ b/src/s/usg5-4.h Wed Jul 23 08:29:24 2008 +0000 @@ -85,10 +85,6 @@ #define rindex strrchr #endif /* ! defined (HAVE_RINDEX) */ -/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */ - -#define ADDR_CORRECT(x) (x) - /* Use terminfo instead of termcap. */ #define TERMINFO
--- a/src/unexaix.c Wed Jul 23 08:02:27 2008 +0000 +++ b/src/unexaix.c Wed Jul 23 08:29:24 2008 +0000 @@ -103,14 +103,6 @@ static int pagemask; -/* Correct an int which is the bit pattern of a pointer to a byte - into an int which is the number of a byte. - This is a no-op on ordinary machines, but not on all. */ - -#ifndef ADDR_CORRECT /* Let m-*.h files override this definition */ -#define ADDR_CORRECT(x) ((char *)(x) - (char*)0) -#endif - #ifdef emacs #include "lisp.h"
--- a/src/unexec.c Wed Jul 23 08:02:27 2008 +0000 +++ b/src/unexec.c Wed Jul 23 08:29:24 2008 +0000 @@ -117,15 +117,6 @@ This macro can be used to generate statements to adjust or initialize nonstandard fields in the file header -* ADDR_CORRECT(ADDR) - -Macro to correct an int which is the bit pattern of a pointer to a byte -into an int which is the number of a byte. - -This macro has a default definition which is usually right. -This default definition is a no-op on most machines (where a -pointer looks like an int) but not on all machines. - */ #ifndef emacs @@ -209,9 +200,7 @@ into an int which is the number of a byte. This is a no-op on ordinary machines, but not on all. */ -#ifndef ADDR_CORRECT /* Let m-*.h files override this definition */ #define ADDR_CORRECT(x) ((char *)(x) - (char*)0) -#endif #ifdef emacs