From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 9 Dec 2013 08:23:01 +0000 (+0100)
Subject: * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~497
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e48429a26cf87bdbabc242bc8fce447e3910adf;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e7016c6165b..159bf04075e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
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.  */)
 {
   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;
 }