diff options
| author | Dan Nicolaescu | 2010-05-15 22:40:10 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-05-15 22:40:10 -0700 |
| commit | 95adb4b161764fa6c9d46da52165852929a34e45 (patch) | |
| tree | 026aa64927e0e2e93428b51ca3bdecad584acc5a /src | |
| parent | c31de8bf1fb29308b5a9a3dc6c6797f866d29802 (diff) | |
| download | emacs-95adb4b161764fa6c9d46da52165852929a34e45.tar.gz emacs-95adb4b161764fa6c9d46da52165852929a34e45.zip | |
* m/ia64.h (UNEXEC): Remove reference to CANNOT_EXEC, not used anymore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/m/ia64.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6847afcb9d6..3fc8f0844c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-16 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * m/ia64.h (UNEXEC): Remove, set in s/*.h. | ||
| 4 | |||
| 1 | 2010-05-16 Glenn Morris <rgm@gnu.org> | 5 | 2010-05-16 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (LIBX_BASE): Always define. | 7 | * Makefile.in (LIBX_BASE): Always define. |
diff --git a/src/m/ia64.h b/src/m/ia64.h index acf6c25844f..03ec37b4269 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h | |||
| @@ -48,11 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 50 | 50 | ||
| 51 | #ifdef __ELF__ | ||
| 52 | #undef UNEXEC | ||
| 53 | #define UNEXEC unexelf.o | ||
| 54 | #endif | ||
| 55 | |||
| 56 | #ifndef NOT_C_CODE | 51 | #ifndef NOT_C_CODE |
| 57 | 52 | ||
| 58 | #ifdef REL_ALLOC | 53 | #ifdef REL_ALLOC |