From: Dave Love <fx@gnu.org>
Date: Mon, 14 Aug 2000 14:15:44 +0000 (+0000)
Subject: [HAVE_UNISTD_H]: Include unistd.h; don't declare sbrk.
X-Git-Tag: emacs-pretest-21.0.90~2329
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf952fb6449772186914a0324732782bc2900d48;p=emacs.git

[HAVE_UNISTD_H]: Include unistd.h; don't declare sbrk.
[!HAVE_UNISTD_H]: Use POINTER_TYPE to declare sbrk.
(lisp_free): Declare and make static.
---

diff --git a/src/alloc.c b/src/alloc.c
index b7c61b4bd07..497c01c707d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -43,7 +43,11 @@ Boston, MA 02111-1307, USA.  */
 #include "syssignal.h"
 #include <setjmp.h>
 
-extern char *sbrk ();
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#else
+extern POINTER_TYPE *sbrk ();
+#endif
 
 #ifdef DOUG_LEA_MALLOC
 
@@ -283,6 +287,7 @@ Lisp_Object Vdead;
 
 struct mem_node;
 static void *lisp_malloc P_ ((size_t, enum mem_type));
+static void lisp_free P_ ((POINTER_TYPE *));
 static void mark_stack P_ ((void));
 static void init_stack P_ ((Lisp_Object *));
 static int live_vector_p P_ ((struct mem_node *, void *));
@@ -512,7 +517,7 @@ allocate_buffer ()
 /* Free BLOCK.  This must be called to free memory allocated with a
    call to lisp_malloc.  */
 
-void
+static void
 lisp_free (block)
      POINTER_TYPE *block;
 {