diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/s/gnu-linux.h | 6 | ||||
| -rw-r--r-- | src/s/irix6-5.h | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f08d108f5d..c66b38147ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> | 1 | 2012-07-13 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * s/gnu-linux.h, s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE. | ||
| 4 | |||
| 3 | * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION. | 5 | * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION. |
| 4 | * s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro. | 6 | * s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro. |
| 5 | 7 | ||
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 569b69f574b..30bdf0407be 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -57,9 +57,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 57 | #else | 57 | #else |
| 58 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE | 58 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE |
| 59 | #endif | 59 | #endif |
| 60 | |||
| 61 | #ifdef __i386__ | ||
| 62 | /* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */ | ||
| 63 | /* we cannot get the maximum address for brk */ | ||
| 64 | # define ULIMIT_BREAK_VALUE (32*1024*1024) | ||
| 65 | #endif | ||
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index 39ac59a00c2..a8923d230d2 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h | |||
| @@ -30,9 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | char *_getpty(); | 30 | char *_getpty(); |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | /* Ulimit(UL_GMEMLIM) is busted... */ | ||
| 34 | #define ULIMIT_BREAK_VALUE 0x14000000 | ||
| 35 | |||
| 36 | #undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ | 33 | #undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ |
| 37 | 34 | ||
| 38 | #undef TIOCSIGSEND /* defined in usg5-4-common.h */ | 35 | #undef TIOCSIGSEND /* defined in usg5-4-common.h */ |