aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-12-09 09:23:01 +0100
committerJan Djärv2013-12-09 09:23:01 +0100
commit5e48429a26cf87bdbabc242bc8fce447e3910adf (patch)
tree9a48ebdcb7aaa464a03c6dd41cbb86607c1a7f18 /src
parent8212d9c0da266e8bfb9100385113e0d7e744041e (diff)
downloademacs-5e48429a26cf87bdbabc242bc8fce447e3910adf.tar.gz
emacs-5e48429a26cf87bdbabc242bc8fce447e3910adf.zip
* alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e7016c6165b..159bf04075e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-09 Jan Djärv <jan.h.d@swipnet.se>
2
3 * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.
4
12013-12-08 Jan Djärv <jan.h.d@swipnet.se> 52013-12-08 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating. 7 * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.
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}