diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/alloc.c b/src/alloc.c index 9278f226b69..3ed8cc2d990 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -355,7 +355,7 @@ static void mem_rotate_left (struct mem_node *); | |||
| 355 | static void mem_rotate_right (struct mem_node *); | 355 | static void mem_rotate_right (struct mem_node *); |
| 356 | static void mem_delete (struct mem_node *); | 356 | static void mem_delete (struct mem_node *); |
| 357 | static void mem_delete_fixup (struct mem_node *); | 357 | static void mem_delete_fixup (struct mem_node *); |
| 358 | static inline struct mem_node *mem_find (void *); | 358 | static struct mem_node *mem_find (void *); |
| 359 | #endif | 359 | #endif |
| 360 | 360 | ||
| 361 | 361 | ||
| @@ -3550,7 +3550,7 @@ mem_init (void) | |||
| 3550 | /* Value is a pointer to the mem_node containing START. Value is | 3550 | /* Value is a pointer to the mem_node containing START. Value is |
| 3551 | MEM_NIL if there is no node in the tree containing START. */ | 3551 | MEM_NIL if there is no node in the tree containing START. */ |
| 3552 | 3552 | ||
| 3553 | static inline struct mem_node * | 3553 | static struct mem_node * |
| 3554 | mem_find (void *start) | 3554 | mem_find (void *start) |
| 3555 | { | 3555 | { |
| 3556 | struct mem_node *p; | 3556 | struct mem_node *p; |
| @@ -3926,7 +3926,7 @@ mem_delete_fixup (struct mem_node *x) | |||
| 3926 | /* Value is non-zero if P is a pointer to a live Lisp string on | 3926 | /* Value is non-zero if P is a pointer to a live Lisp string on |
| 3927 | the heap. M is a pointer to the mem_block for P. */ | 3927 | the heap. M is a pointer to the mem_block for P. */ |
| 3928 | 3928 | ||
| 3929 | static inline bool | 3929 | static bool |
| 3930 | live_string_p (struct mem_node *m, void *p) | 3930 | live_string_p (struct mem_node *m, void *p) |
| 3931 | { | 3931 | { |
| 3932 | if (m->type == MEM_TYPE_STRING) | 3932 | if (m->type == MEM_TYPE_STRING) |
| @@ -3949,7 +3949,7 @@ live_string_p (struct mem_node *m, void *p) | |||
| 3949 | /* Value is non-zero if P is a pointer to a live Lisp cons on | 3949 | /* Value is non-zero if P is a pointer to a live Lisp cons on |
| 3950 | the heap. M is a pointer to the mem_block for P. */ | 3950 | the heap. M is a pointer to the mem_block for P. */ |
| 3951 | 3951 | ||
| 3952 | static inline bool | 3952 | static bool |
| 3953 | live_cons_p (struct mem_node *m, void *p) | 3953 | live_cons_p (struct mem_node *m, void *p) |
| 3954 | { | 3954 | { |
| 3955 | if (m->type == MEM_TYPE_CONS) | 3955 | if (m->type == MEM_TYPE_CONS) |
| @@ -3975,7 +3975,7 @@ live_cons_p (struct mem_node *m, void *p) | |||
| 3975 | /* Value is non-zero if P is a pointer to a live Lisp symbol on | 3975 | /* Value is non-zero if P is a pointer to a live Lisp symbol on |
| 3976 | the heap. M is a pointer to the mem_block for P. */ | 3976 | the heap. M is a pointer to the mem_block for P. */ |
| 3977 | 3977 | ||
| 3978 | static inline bool | 3978 | static bool |
| 3979 | live_symbol_p (struct mem_node *m, void *p) | 3979 | live_symbol_p (struct mem_node *m, void *p) |
| 3980 | { | 3980 | { |
| 3981 | if (m->type == MEM_TYPE_SYMBOL) | 3981 | if (m->type == MEM_TYPE_SYMBOL) |
| @@ -4001,7 +4001,7 @@ live_symbol_p (struct mem_node *m, void *p) | |||
| 4001 | /* Value is non-zero if P is a pointer to a live Lisp float on | 4001 | /* Value is non-zero if P is a pointer to a live Lisp float on |
| 4002 | the heap. M is a pointer to the mem_block for P. */ | 4002 | the heap. M is a pointer to the mem_block for P. */ |
| 4003 | 4003 | ||
| 4004 | static inline bool | 4004 | static bool |
| 4005 | live_float_p (struct mem_node *m, void *p) | 4005 | live_float_p (struct mem_node *m, void *p) |
| 4006 | { | 4006 | { |
| 4007 | if (m->type == MEM_TYPE_FLOAT) | 4007 | if (m->type == MEM_TYPE_FLOAT) |
| @@ -4025,7 +4025,7 @@ live_float_p (struct mem_node *m, void *p) | |||
| 4025 | /* Value is non-zero if P is a pointer to a live Lisp Misc on | 4025 | /* Value is non-zero if P is a pointer to a live Lisp Misc on |
| 4026 | the heap. M is a pointer to the mem_block for P. */ | 4026 | the heap. M is a pointer to the mem_block for P. */ |
| 4027 | 4027 | ||
| 4028 | static inline bool | 4028 | static bool |
| 4029 | live_misc_p (struct mem_node *m, void *p) | 4029 | live_misc_p (struct mem_node *m, void *p) |
| 4030 | { | 4030 | { |
| 4031 | if (m->type == MEM_TYPE_MISC) | 4031 | if (m->type == MEM_TYPE_MISC) |
| @@ -4051,7 +4051,7 @@ live_misc_p (struct mem_node *m, void *p) | |||
| 4051 | /* Value is non-zero if P is a pointer to a live vector-like object. | 4051 | /* Value is non-zero if P is a pointer to a live vector-like object. |
| 4052 | M is a pointer to the mem_block for P. */ | 4052 | M is a pointer to the mem_block for P. */ |
| 4053 | 4053 | ||
| 4054 | static inline bool | 4054 | static bool |
| 4055 | live_vector_p (struct mem_node *m, void *p) | 4055 | live_vector_p (struct mem_node *m, void *p) |
| 4056 | { | 4056 | { |
| 4057 | if (m->type == MEM_TYPE_VECTOR_BLOCK) | 4057 | if (m->type == MEM_TYPE_VECTOR_BLOCK) |
| @@ -4087,7 +4087,7 @@ live_vector_p (struct mem_node *m, void *p) | |||
| 4087 | /* Value is non-zero if P is a pointer to a live buffer. M is a | 4087 | /* Value is non-zero if P is a pointer to a live buffer. M is a |
| 4088 | pointer to the mem_block for P. */ | 4088 | pointer to the mem_block for P. */ |
| 4089 | 4089 | ||
| 4090 | static inline bool | 4090 | static bool |
| 4091 | live_buffer_p (struct mem_node *m, void *p) | 4091 | live_buffer_p (struct mem_node *m, void *p) |
| 4092 | { | 4092 | { |
| 4093 | /* P must point to the start of the block, and the buffer | 4093 | /* P must point to the start of the block, and the buffer |
| @@ -4153,7 +4153,7 @@ DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "", | |||
| 4153 | 4153 | ||
| 4154 | /* Mark OBJ if we can prove it's a Lisp_Object. */ | 4154 | /* Mark OBJ if we can prove it's a Lisp_Object. */ |
| 4155 | 4155 | ||
| 4156 | static inline void | 4156 | static void |
| 4157 | mark_maybe_object (Lisp_Object obj) | 4157 | mark_maybe_object (Lisp_Object obj) |
| 4158 | { | 4158 | { |
| 4159 | void *po; | 4159 | void *po; |
| @@ -4222,7 +4222,7 @@ mark_maybe_object (Lisp_Object obj) | |||
| 4222 | /* If P points to Lisp data, mark that as live if it isn't already | 4222 | /* If P points to Lisp data, mark that as live if it isn't already |
| 4223 | marked. */ | 4223 | marked. */ |
| 4224 | 4224 | ||
| 4225 | static inline void | 4225 | static void |
| 4226 | mark_maybe_pointer (void *p) | 4226 | mark_maybe_pointer (void *p) |
| 4227 | { | 4227 | { |
| 4228 | struct mem_node *m; | 4228 | struct mem_node *m; |
| @@ -5052,7 +5052,7 @@ inhibit_garbage_collection (void) | |||
| 5052 | /* Used to avoid possible overflows when | 5052 | /* Used to avoid possible overflows when |
| 5053 | converting from C to Lisp integers. */ | 5053 | converting from C to Lisp integers. */ |
| 5054 | 5054 | ||
| 5055 | static inline Lisp_Object | 5055 | static Lisp_Object |
| 5056 | bounded_number (EMACS_INT number) | 5056 | bounded_number (EMACS_INT number) |
| 5057 | { | 5057 | { |
| 5058 | return make_number (min (MOST_POSITIVE_FIXNUM, number)); | 5058 | return make_number (min (MOST_POSITIVE_FIXNUM, number)); |