diff options
| author | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
| commit | 2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9 (patch) | |
| tree | 3711b97807201b7eeaa066003b1c3a4ce929e5bb /src/alloc.c | |
| parent | e1d276cbf9e18f13101328f56bed1a1c0a66e63a (diff) | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
| download | emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.tar.gz emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.zip | |
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/alloc.c b/src/alloc.c index a66a752f5dc..28c9b51dab4 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -63,10 +63,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | #include <unistd.h> | 65 | #include <unistd.h> |
| 66 | #ifndef HAVE_UNISTD_H | ||
| 67 | extern void *sbrk (); | ||
| 68 | #endif | ||
| 69 | |||
| 70 | #include <fcntl.h> | 66 | #include <fcntl.h> |
| 71 | 67 | ||
| 72 | #ifdef USE_GTK | 68 | #ifdef USE_GTK |
| @@ -3212,7 +3208,7 @@ static struct Lisp_Symbol *symbol_free_list; | |||
| 3212 | 3208 | ||
| 3213 | DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, | 3209 | DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, |
| 3214 | doc: /* Return a newly allocated uninterned symbol whose name is NAME. | 3210 | doc: /* Return a newly allocated uninterned symbol whose name is NAME. |
| 3215 | Its value and function definition are void, and its property list is nil. */) | 3211 | Its value is void, and its function definition and property list are nil. */) |
| 3216 | (Lisp_Object name) | 3212 | (Lisp_Object name) |
| 3217 | { | 3213 | { |
| 3218 | register Lisp_Object val; | 3214 | register Lisp_Object val; |
| @@ -3249,7 +3245,7 @@ Its value and function definition are void, and its property list is nil. */) | |||
| 3249 | set_symbol_plist (val, Qnil); | 3245 | set_symbol_plist (val, Qnil); |
| 3250 | p->redirect = SYMBOL_PLAINVAL; | 3246 | p->redirect = SYMBOL_PLAINVAL; |
| 3251 | SET_SYMBOL_VAL (p, Qunbound); | 3247 | SET_SYMBOL_VAL (p, Qunbound); |
| 3252 | set_symbol_function (val, Qunbound); | 3248 | set_symbol_function (val, Qnil); |
| 3253 | set_symbol_next (val, NULL); | 3249 | set_symbol_next (val, NULL); |
| 3254 | p->gcmarkbit = 0; | 3250 | p->gcmarkbit = 0; |
| 3255 | p->interned = SYMBOL_UNINTERNED; | 3251 | p->interned = SYMBOL_UNINTERNED; |
| @@ -5335,12 +5331,12 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5335 | dump_zombies (); | 5331 | dump_zombies (); |
| 5336 | #endif | 5332 | #endif |
| 5337 | 5333 | ||
| 5338 | unblock_input (); | ||
| 5339 | |||
| 5340 | check_cons_list (); | 5334 | check_cons_list (); |
| 5341 | 5335 | ||
| 5342 | gc_in_progress = 0; | 5336 | gc_in_progress = 0; |
| 5343 | 5337 | ||
| 5338 | unblock_input (); | ||
| 5339 | |||
| 5344 | consing_since_gc = 0; | 5340 | consing_since_gc = 0; |
| 5345 | if (gc_cons_threshold < GC_DEFAULT_THRESHOLD / 10) | 5341 | if (gc_cons_threshold < GC_DEFAULT_THRESHOLD / 10) |
| 5346 | gc_cons_threshold = GC_DEFAULT_THRESHOLD / 10; | 5342 | gc_cons_threshold = GC_DEFAULT_THRESHOLD / 10; |