diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/s/gnu-linux.h | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index d04ea33068a..409d0205520 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -157,3 +157,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 157 | #else | 157 | #else |
| 158 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE | 158 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE |
| 159 | #endif | 159 | #endif |
| 160 | |||
| 161 | #ifdef __i386__ | ||
| 162 | /* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */ | ||
| 163 | /* we cannot get the maximum address for brk */ | ||
| 164 | # define ULIMIT_BREAK_VALUE (32*1024*1024) | ||
| 165 | #endif | ||