mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

* alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.

Browse source
This commit is contained in:
Jan Djärv 2013-12-09 09:23:01 +01:00
parent 8212d9c0da
commit 5e48429a26
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-09 Jan Djärv <jan.h.d@swipnet.se>
* alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.
2013-12-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.

5
src/alloc.c
View file

@ -6633,7 +6633,12 @@ We divide the value by 1024 to make sure it fits in a Lisp integer. */)
{
Lisp_Object end;
#ifdef HAVE_NS
/* Avoid warning. sbrk has no relation to memory allocated anyway. */
XSETINT (end, 0);
#else
XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024);
#endif
return end;
}