diff options
| author | Eli Zaretskii | 2013-12-09 19:20:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-09 19:20:34 +0200 |
| commit | cc24ef09f8c050808f9f4989e49122b206e8c934 (patch) | |
| tree | 578b29e1c9dd276a965e7b2559f8b09c21df9a83 /src/alloc.c | |
| parent | 439b1ae89e7c0660ef0a8fa540b12977e38dedf8 (diff) | |
| parent | ad8a47b89fc3c5a3302255f318b1ed805838cf72 (diff) | |
| download | emacs-cc24ef09f8c050808f9f4989e49122b206e8c934.tar.gz emacs-cc24ef09f8c050808f9f4989e49122b206e8c934.zip | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index f076075a94f..aeda42637cd 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6633,7 +6633,12 @@ We divide the value by 1024 to make sure it fits in a Lisp integer. */) | |||
| 6633 | { | 6633 | { |
| 6634 | Lisp_Object end; | 6634 | Lisp_Object end; |
| 6635 | 6635 | ||
| 6636 | #ifdef HAVE_NS | ||
| 6637 | /* Avoid warning. sbrk has no relation to memory allocated anyway. */ | ||
| 6638 | XSETINT (end, 0); | ||
| 6639 | #else | ||
| 6636 | XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024); | 6640 | XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024); |
| 6641 | #endif | ||
| 6637 | 6642 | ||
| 6638 | return end; | 6643 | return end; |
| 6639 | } | 6644 | } |