aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-11-18 13:45:03 -0800
committerDan Nicolaescu2010-11-18 13:45:03 -0800
commit84dfc8a7faccf53d54231ab47a2dc237c80251fb (patch)
treefe57388c26d71f97db0d0f158e5ac8347b078c0c /src
parent94fa383385a237b800e9096c4fb3019f5cd359ae (diff)
downloademacs-84dfc8a7faccf53d54231ab47a2dc237c80251fb.tar.gz
emacs-84dfc8a7faccf53d54231ab47a2dc237c80251fb.zip
* src/alloc.c (refill_memory_reserve): Move declaration ...
* src/lisp.h (refill_memory_reserve): ... here.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/alloc.c1
-rw-r--r--src/lisp.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cebb4fc97ed..9c113a35a77 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-11-18 Dan Nicolaescu <dann@ics.uci.edu> 12010-11-18 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * alloc.c (refill_memory_reserve): Move declaration ...
4 * lisp.h (refill_memory_reserve): ... here.
5
3 * strftime.c (_strftime_copytm): Add declaration. 6 * strftime.c (_strftime_copytm): Add declaration.
4 7
5 * callproc.c (syms_of_callproc): Use intern_c_string. 8 * callproc.c (syms_of_callproc): Use intern_c_string.
diff --git a/src/alloc.c b/src/alloc.c
index fa39c1ee5dc..6e121212b14 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -351,7 +351,6 @@ enum mem_type
351 351
352static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type); 352static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type);
353static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); 353static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
354void refill_memory_reserve (void);
355 354
356 355
357#if GC_MARK_STACK || defined GC_MALLOC_CHECK 356#if GC_MARK_STACK || defined GC_MALLOC_CHECK
diff --git a/src/lisp.h b/src/lisp.h
index 8ddd7af79a8..117e810e565 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2736,6 +2736,7 @@ extern void memory_full (void) NO_RETURN;
2736extern void buffer_memory_full (void) NO_RETURN; 2736extern void buffer_memory_full (void) NO_RETURN;
2737extern int survives_gc_p (Lisp_Object); 2737extern int survives_gc_p (Lisp_Object);
2738extern void mark_object (Lisp_Object); 2738extern void mark_object (Lisp_Object);
2739extern void refill_memory_reserve (void);
2739extern const char *pending_malloc_warning; 2740extern const char *pending_malloc_warning;
2740extern Lisp_Object Vpurify_flag; 2741extern Lisp_Object Vpurify_flag;
2741extern Lisp_Object Vmemory_full; 2742extern Lisp_Object Vmemory_full;