From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Apr 2011 06:15:53 +0000 (-0700)
Subject: 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~296
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69003fd8410b1d08ad4364af1eb29a4b795f59bb;p=emacs.git

2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>

* alloc.c (refill_memory_reserve): Now static if
!defined REL_ALLOC || defined SYSTEM_MALLOC.
* lisp.h (refill_memory_reserve): Declare only if not static.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 15e2aaf9714..fb97a49e5b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,8 @@
-2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+ 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* alloc.c (refill_memory_reserve): Now static if
+	!defined REL_ALLOC || defined SYSTEM_MALLOC.
+	* lisp.h (refill_memory_reserve): Declare only if not static.
 
 	* xsettings.c, xsettings.h (xsettings_get_system_normal_font):
 	Define only if USE_LUCID.
diff --git a/src/alloc.c b/src/alloc.c
index d1d6323f905..1c793c985eb 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -280,6 +280,9 @@ static void gc_sweep (void);
 static void mark_glyph_matrix (struct glyph_matrix *);
 static void mark_face_cache (struct face_cache *);
 
+#if !defined REL_ALLOC || defined SYSTEM_MALLOC
+static void refill_memory_reserve (void);
+#endif
 static struct Lisp_String *allocate_string (void);
 static void compact_small_strings (void);
 static void free_large_strings (void);
diff --git a/src/lisp.h b/src/lisp.h
index 4696a1c3432..4c7c5b50c89 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2652,7 +2652,9 @@ extern void memory_full (void) NO_RETURN;
 extern void buffer_memory_full (void) NO_RETURN;
 extern int survives_gc_p (Lisp_Object);
 extern void mark_object (Lisp_Object);
+#if defined REL_ALLOC && !defined SYSTEM_MALLOC
 extern void refill_memory_reserve (void);
+#endif
 extern const char *pending_malloc_warning;
 extern Lisp_Object *stack_base;
 EXFUN (Fcons, 2);