diff options
| author | Paul Eggert | 2011-11-19 19:07:02 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 19:07:02 -0800 |
| commit | 615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch) | |
| tree | e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src/s | |
| parent | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff) | |
| parent | e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff) | |
| download | emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip | |
Merge from trunk.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/msdos.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/s/msdos.h b/src/s/msdos.h index 29ca0629899..9ee13d12867 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -119,7 +119,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 119 | #ifdef HAVE_X_WINDOWS | 119 | #ifdef HAVE_X_WINDOWS |
| 120 | /* We need a little extra space, see ../../lisp/loadup.el and the | 120 | /* We need a little extra space, see ../../lisp/loadup.el and the |
| 121 | commentary below, in the non-X branch. The 140KB number was | 121 | commentary below, in the non-X branch. The 140KB number was |
| 122 | measured on GNU/Linux and on MS-WIndows. */ | 122 | measured on GNU/Linux and on MS-Windows. */ |
| 123 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) | 123 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) |
| 124 | #else | 124 | #else |
| 125 | /* We need a little extra space, see ../../lisp/loadup.el. | 125 | /* We need a little extra space, see ../../lisp/loadup.el. |
| @@ -138,4 +138,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 138 | registers relevant for conservative garbage collection in the jmp_buf. */ | 138 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 139 | #define GC_SETJMP_WORKS 1 | 139 | #define GC_SETJMP_WORKS 1 |
| 140 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 140 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 141 | |||