aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert2012-08-21 16:39:56 -0700
committerPaul Eggert2012-08-21 16:39:56 -0700
commitfce31d69dc4d6ff8810d499deebe568437fbf38b (patch)
tree4deb5628e430c3f756d235cdbb87244680636173 /src/lisp.h
parentd0d2d26fba3df1121108fcf80e4a26549d7736a3 (diff)
downloademacs-fce31d69dc4d6ff8810d499deebe568437fbf38b.tar.gz
emacs-fce31d69dc4d6ff8810d499deebe568437fbf38b.zip
* alloc.c: Use bool for booleans.
(gc_in_progress, abort_on_gc) (setjmp_tested_p) [!GC_SAVE_REGISTERS_ON_STACK && !GC_SETJMP_WORKS]: (dont_register_blocks) [GC_MALLOC_CHECK]: (suppress_checking) [ENABLE_CHECKING]: Now bool, not int. (check_string_bytes, make_specified_string, memory_full) (live_string_p, live_cons_p, live_symbol_p, live_float_p) (live_misc_p, live_vector_p, live_buffer_p, mark_maybe_object) (mark_stack, valid_pointer_p, make_pure_string) (Fgarbage_collect, survives_gc_p, gc_sweep): Use bool for booleans, instead of int. (test_setjmp) [!GC_SAVE_REGISTERS_ON_STACK && !GC_SETJMP_WORKS]: Remove unused local. * alloc.c (PURE_POINTER_P): * lisp.h (STRING_MULTIBYTE): Document that it returns a boolean. * editfns.c (Fformat): * fileio.c (Fexpand_file_name, Fsubstitute_in_file_name) (Fdo_auto_save): * fns.c (sweep_weak_table): * lisp.h (suppress_checking, push_message, survives_gc_p) (make_pure_string, gc_in_progress, abort_on_gc): * lread.c (readchar, read1): * print.c (Fprin1_to_string): * xdisp.c (push_message): Use bool for booleans affected directly or indirectly by alloc.c's changes.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 30bbb65f4fa..d9a7c9d0bdc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -124,7 +124,7 @@ extern _Noreturn void die (const char *, const char *, int);
124 eassert macro altogether, e.g., if XSTRING (x) uses eassert to test 124 eassert macro altogether, e.g., if XSTRING (x) uses eassert to test
125 STRINGP (x), but a particular use of XSTRING is invoked only after 125 STRINGP (x), but a particular use of XSTRING is invoked only after
126 testing that STRINGP (x) is true, making the test redundant. */ 126 testing that STRINGP (x) is true, making the test redundant. */
127extern int suppress_checking EXTERNALLY_VISIBLE; 127extern bool suppress_checking EXTERNALLY_VISIBLE;
128 128
129# define eassert(cond) \ 129# define eassert(cond) \
130 ((cond) || suppress_checking \ 130 ((cond) || suppress_checking \
@@ -702,7 +702,7 @@ struct Lisp_Cons
702#define CDR_SAFE(c) \ 702#define CDR_SAFE(c) \
703 (CONSP ((c)) ? XCDR ((c)) : Qnil) 703 (CONSP ((c)) ? XCDR ((c)) : Qnil)
704 704
705/* Nonzero if STR is a multibyte string. */ 705/* True if STR is a multibyte string. */
706#define STRING_MULTIBYTE(STR) \ 706#define STRING_MULTIBYTE(STR) \
707 (XSTRING (STR)->size_byte >= 0) 707 (XSTRING (STR)->size_byte >= 0)
708 708
@@ -2799,7 +2799,7 @@ extern Lisp_Object echo_area_buffer[2];
2799extern void add_to_log (const char *, Lisp_Object, Lisp_Object); 2799extern void add_to_log (const char *, Lisp_Object, Lisp_Object);
2800extern void check_message_stack (void); 2800extern void check_message_stack (void);
2801extern void setup_echo_area_for_printing (int); 2801extern void setup_echo_area_for_printing (int);
2802extern int push_message (void); 2802extern bool push_message (void);
2803extern Lisp_Object pop_message_unwind (Lisp_Object); 2803extern Lisp_Object pop_message_unwind (Lisp_Object);
2804extern Lisp_Object restore_message_unwind (Lisp_Object); 2804extern Lisp_Object restore_message_unwind (Lisp_Object);
2805extern void restore_message (void); 2805extern void restore_message (void);
@@ -2842,7 +2842,7 @@ extern void uninterrupt_malloc (void);
2842extern void malloc_warning (const char *); 2842extern void malloc_warning (const char *);
2843extern _Noreturn void memory_full (size_t); 2843extern _Noreturn void memory_full (size_t);
2844extern _Noreturn void buffer_memory_full (ptrdiff_t); 2844extern _Noreturn void buffer_memory_full (ptrdiff_t);
2845extern int survives_gc_p (Lisp_Object); 2845extern bool survives_gc_p (Lisp_Object);
2846extern void mark_object (Lisp_Object); 2846extern void mark_object (Lisp_Object);
2847#if defined REL_ALLOC && !defined SYSTEM_MALLOC 2847#if defined REL_ALLOC && !defined SYSTEM_MALLOC
2848extern void refill_memory_reserve (void); 2848extern void refill_memory_reserve (void);
@@ -2881,8 +2881,8 @@ extern Lisp_Object make_uninit_string (EMACS_INT);
2881extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT); 2881extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT);
2882extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t); 2882extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t);
2883extern Lisp_Object make_specified_string (const char *, 2883extern Lisp_Object make_specified_string (const char *,
2884 ptrdiff_t, ptrdiff_t, int); 2884 ptrdiff_t, ptrdiff_t, bool);
2885extern Lisp_Object make_pure_string (const char *, ptrdiff_t, ptrdiff_t, int); 2885extern Lisp_Object make_pure_string (const char *, ptrdiff_t, ptrdiff_t, bool);
2886extern Lisp_Object make_pure_c_string (const char *, ptrdiff_t); 2886extern Lisp_Object make_pure_c_string (const char *, ptrdiff_t);
2887 2887
2888/* Make a string allocated in pure space, use STR as string data. */ 2888/* Make a string allocated in pure space, use STR as string data. */
@@ -2916,8 +2916,8 @@ extern struct window *allocate_window (void);
2916extern struct frame *allocate_frame (void); 2916extern struct frame *allocate_frame (void);
2917extern struct Lisp_Process *allocate_process (void); 2917extern struct Lisp_Process *allocate_process (void);
2918extern struct terminal *allocate_terminal (void); 2918extern struct terminal *allocate_terminal (void);
2919extern int gc_in_progress; 2919extern bool gc_in_progress;
2920extern int abort_on_gc; 2920extern bool abort_on_gc;
2921extern Lisp_Object make_float (double); 2921extern Lisp_Object make_float (double);
2922extern void display_malloc_warning (void); 2922extern void display_malloc_warning (void);
2923extern ptrdiff_t inhibit_garbage_collection (void); 2923extern ptrdiff_t inhibit_garbage_collection (void);