aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-01-15 13:38:58 -0800
committerPaul Eggert2013-01-15 13:38:58 -0800
commit963ea40fe96634a01b24aef4fc39acf9a4236eb7 (patch)
tree9f4dea570aa1bbbaf068d8bc66db8f4b7cb0ba6e /src
parent1a353a145dba49c91cdf4d2189ebe6579cae24ac (diff)
downloademacs-963ea40fe96634a01b24aef4fc39acf9a4236eb7.tar.gz
emacs-963ea40fe96634a01b24aef4fc39acf9a4236eb7.zip
* src/alloc.c (free_save_value): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c3
-rw-r--r--src/lisp.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4574d3fe23d..115b8d42915 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-01-15 Paul Eggert <eggert@cs.ucla.edu>
2
3 * alloc.c (free_save_value): Now static.
4
12013-01-15 Dmitry Antipov <dmantipov@yandex.ru> 52013-01-15 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * keymap.c (map_keymap_internal): Use format_save_value. 7 * keymap.c (map_keymap_internal): Use format_save_value.
diff --git a/src/alloc.c b/src/alloc.c
index b83b621bc7d..7275a01bb73 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -209,6 +209,7 @@ Lisp_Object Qchar_table_extra_slots;
209 209
210static Lisp_Object Qpost_gc_hook; 210static Lisp_Object Qpost_gc_hook;
211 211
212static void free_save_value (Lisp_Object);
212static void mark_terminals (void); 213static void mark_terminals (void);
213static void gc_sweep (void); 214static void gc_sweep (void);
214static Lisp_Object make_pure_vector (ptrdiff_t); 215static Lisp_Object make_pure_vector (ptrdiff_t);
@@ -3417,7 +3418,7 @@ make_save_value (void *pointer, ptrdiff_t integer)
3417/* Free a Lisp_Save_Value object. Do not use this function 3418/* Free a Lisp_Save_Value object. Do not use this function
3418 if SAVE contains pointer other than returned by xmalloc. */ 3419 if SAVE contains pointer other than returned by xmalloc. */
3419 3420
3420void 3421static void
3421free_save_value (Lisp_Object save) 3422free_save_value (Lisp_Object save)
3422{ 3423{
3423 xfree (XSAVE_POINTER (save, 0)); 3424 xfree (XSAVE_POINTER (save, 0));
diff --git a/src/lisp.h b/src/lisp.h
index 1ff8f83270b..40e4821bc10 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3020,7 +3020,6 @@ extern void display_malloc_warning (void);
3020extern ptrdiff_t inhibit_garbage_collection (void); 3020extern ptrdiff_t inhibit_garbage_collection (void);
3021extern Lisp_Object format_save_value (const char *, ...); 3021extern Lisp_Object format_save_value (const char *, ...);
3022extern Lisp_Object make_save_value (void *, ptrdiff_t); 3022extern Lisp_Object make_save_value (void *, ptrdiff_t);
3023extern void free_save_value (Lisp_Object);
3024extern Lisp_Object build_overlay (Lisp_Object, Lisp_Object, Lisp_Object); 3023extern Lisp_Object build_overlay (Lisp_Object, Lisp_Object, Lisp_Object);
3025extern void free_marker (Lisp_Object); 3024extern void free_marker (Lisp_Object);
3026extern void free_cons (struct Lisp_Cons *); 3025extern void free_cons (struct Lisp_Cons *);