From 7a14f2a03e95f5ac10d5603da6fa52777f16968e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 23 Jul 2008 08:29:24 +0000 Subject: [PATCH] * 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. --- admin/CPP-DEFINES | 1 - src/ChangeLog | 7 +++++++ src/m/ibmrs6000.h | 3 --- src/s/usg5-4.h | 4 ---- src/unexaix.c | 8 -------- src/unexec.c | 11 ----------- 6 files changed, 7 insertions(+), 27 deletions(-) diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index cb60bd5f2cc..675695d2424 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -52,7 +52,6 @@ subprocesses System can use subprocesses (for M-x shell for example). Define ** 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 diff --git a/src/ChangeLog b/src/ChangeLog index 8651558ad9e..be233c512f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2008-07-23 Dan Nicolaescu + * 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. diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 90fd21b5cd1..2d8681185ad 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -83,9 +83,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 7ce4790fb76..c729203b671 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -85,10 +85,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/unexaix.c b/src/unexaix.c index c8395101f62..ac9743f8c4b 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -103,14 +103,6 @@ static int adjust_lnnoptrs (int, int, char *); 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" diff --git a/src/unexec.c b/src/unexec.c index a1f962bd606..e3381d6d6ae 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -117,15 +117,6 @@ the bits that must be zero on such a boundary. 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 @@ static int pagemask; 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 -- 2.39.2