[Emacs-diffs] trunk r115438: * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.

[Jan D.]

------------------------------------------------------------
revno: 115438
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-09 09:23:01 +0100
message:
  * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-08 12:59:14 +0000
+++ b/src/ChangeLog     2013-12-09 08:23:01 +0000
@@ -1,3 +1,7 @@
+2013-12-09  Jan Djärv  <address@hidden>
+
+       * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
+
 2013-12-08  Jan Djärv  <address@hidden>
 
        * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-12-01 22:33:13 +0000
+++ b/src/alloc.c       2013-12-09 08:23:01 +0000
@@ -6633,7 +6633,12 @@
 {
   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;
 }