diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/m/alpha.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/m/alpha.h')
| -rw-r--r-- | src/m/alpha.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h index 3a27cfd65d9..2a97a3d5b0c 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Machine description file for the alpha chip. | 1 | /* Machine description file for the alpha chip. |
| 2 | 2 | ||
| 3 | Copyright (C) 1994, 1997, 1999, 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1994, 1997, 1999, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | Author: Rainer Schoepf | 5 | Author: Rainer Schoepf |
| 6 | (according to authors.el) | 6 | (according to authors.el) |
| @@ -31,7 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | 31 | ||
| 32 | #ifdef __ELF__ | 32 | #ifdef __ELF__ |
| 33 | 33 | ||
| 34 | #if !defined(GNU_LINUX) && !defined(__NetBSD__) | 34 | #if !defined (GNU_LINUX) && !defined (__NetBSD__) |
| 35 | #define DATA_START 0x140000000 | 35 | #define DATA_START 0x140000000 |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||