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/intel386.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/m/intel386.h')
| -rw-r--r-- | src/m/intel386.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/m/intel386.h b/src/m/intel386.h index 16f0645715c..78a43e92c21 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Machine description file for intel 386. | 1 | /* Machine description file for intel 386. |
| 2 | 2 | ||
| 3 | Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -19,7 +19,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | #ifdef WINDOWSNT | 21 | #ifdef WINDOWSNT |
| 22 | #define VIRT_ADDR_VARIES | ||
| 23 | #define DATA_START get_data_start () | 22 | #define DATA_START get_data_start () |
| 24 | #endif | 23 | #endif |
| 25 | 24 | ||
| @@ -28,4 +27,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | /* we cannot get the maximum address for brk */ | 27 | /* we cannot get the maximum address for brk */ |
| 29 | #define ULIMIT_BREAK_VALUE (32*1024*1024) | 28 | #define ULIMIT_BREAK_VALUE (32*1024*1024) |
| 30 | #endif | 29 | #endif |
| 31 | |||