diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c index 2d256800466..ad1741e308f 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1880,7 +1880,7 @@ check_string_free_list (void) | |||
| 1880 | while (s != NULL) | 1880 | while (s != NULL) |
| 1881 | { | 1881 | { |
| 1882 | if ((uintptr_t) s < 1024) | 1882 | if ((uintptr_t) s < 1024) |
| 1883 | abort(); | 1883 | abort (); |
| 1884 | s = NEXT_FREE_LISP_STRING (s); | 1884 | s = NEXT_FREE_LISP_STRING (s); |
| 1885 | } | 1885 | } |
| 1886 | } | 1886 | } |
| @@ -2531,17 +2531,17 @@ make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes) | |||
| 2531 | / (sizeof (struct Lisp_Float) * CHAR_BIT + 1)) | 2531 | / (sizeof (struct Lisp_Float) * CHAR_BIT + 1)) |
| 2532 | 2532 | ||
| 2533 | #define GETMARKBIT(block,n) \ | 2533 | #define GETMARKBIT(block,n) \ |
| 2534 | (((block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \ | 2534 | (((block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \ |
| 2535 | >> ((n) % (sizeof(int) * CHAR_BIT))) \ | 2535 | >> ((n) % (sizeof (int) * CHAR_BIT))) \ |
| 2536 | & 1) | 2536 | & 1) |
| 2537 | 2537 | ||
| 2538 | #define SETMARKBIT(block,n) \ | 2538 | #define SETMARKBIT(block,n) \ |
| 2539 | (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \ | 2539 | (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \ |
| 2540 | |= 1 << ((n) % (sizeof(int) * CHAR_BIT)) | 2540 | |= 1 << ((n) % (sizeof (int) * CHAR_BIT)) |
| 2541 | 2541 | ||
| 2542 | #define UNSETMARKBIT(block,n) \ | 2542 | #define UNSETMARKBIT(block,n) \ |
| 2543 | (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \ | 2543 | (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)] \ |
| 2544 | &= ~(1 << ((n) % (sizeof(int) * CHAR_BIT))) | 2544 | &= ~(1 << ((n) % (sizeof (int) * CHAR_BIT))) |
| 2545 | 2545 | ||
| 2546 | #define FLOAT_BLOCK(fptr) \ | 2546 | #define FLOAT_BLOCK(fptr) \ |
| 2547 | ((struct float_block *) (((uintptr_t) (fptr)) & ~(BLOCK_ALIGN - 1))) | 2547 | ((struct float_block *) (((uintptr_t) (fptr)) & ~(BLOCK_ALIGN - 1))) |
| @@ -2553,7 +2553,7 @@ struct float_block | |||
| 2553 | { | 2553 | { |
| 2554 | /* Place `floats' at the beginning, to ease up FLOAT_INDEX's job. */ | 2554 | /* Place `floats' at the beginning, to ease up FLOAT_INDEX's job. */ |
| 2555 | struct Lisp_Float floats[FLOAT_BLOCK_SIZE]; | 2555 | struct Lisp_Float floats[FLOAT_BLOCK_SIZE]; |
| 2556 | int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)]; | 2556 | int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)]; |
| 2557 | struct float_block *next; | 2557 | struct float_block *next; |
| 2558 | }; | 2558 | }; |
| 2559 | 2559 | ||
| @@ -2659,7 +2659,7 @@ struct cons_block | |||
| 2659 | { | 2659 | { |
| 2660 | /* Place `conses' at the beginning, to ease up CONS_INDEX's job. */ | 2660 | /* Place `conses' at the beginning, to ease up CONS_INDEX's job. */ |
| 2661 | struct Lisp_Cons conses[CONS_BLOCK_SIZE]; | 2661 | struct Lisp_Cons conses[CONS_BLOCK_SIZE]; |
| 2662 | int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)]; | 2662 | int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)]; |
| 2663 | struct cons_block *next; | 2663 | struct cons_block *next; |
| 2664 | }; | 2664 | }; |
| 2665 | 2665 | ||
| @@ -2964,7 +2964,7 @@ allocate_hash_table (void) | |||
| 2964 | struct window * | 2964 | struct window * |
| 2965 | allocate_window (void) | 2965 | allocate_window (void) |
| 2966 | { | 2966 | { |
| 2967 | return ALLOCATE_PSEUDOVECTOR(struct window, current_matrix, PVEC_WINDOW); | 2967 | return ALLOCATE_PSEUDOVECTOR (struct window, current_matrix, PVEC_WINDOW); |
| 2968 | } | 2968 | } |
| 2969 | 2969 | ||
| 2970 | 2970 | ||
| @@ -4159,7 +4159,7 @@ mark_maybe_pointer (void *p) | |||
| 4159 | break; | 4159 | break; |
| 4160 | 4160 | ||
| 4161 | case MEM_TYPE_BUFFER: | 4161 | case MEM_TYPE_BUFFER: |
| 4162 | if (live_buffer_p (m, p) && !VECTOR_MARKED_P((struct buffer *)p)) | 4162 | if (live_buffer_p (m, p) && !VECTOR_MARKED_P ((struct buffer *)p)) |
| 4163 | XSETVECTOR (obj, p); | 4163 | XSETVECTOR (obj, p); |
| 4164 | break; | 4164 | break; |
| 4165 | 4165 | ||