diff options
| author | Andreas Schwab | 2003-09-07 19:15:51 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2003-09-07 19:15:51 +0000 |
| commit | 03bb6a06e1af95f7540a3f11a92dbefea0894804 (patch) | |
| tree | 86c83b7d8d94c783d1135780aed21bafb108b253 /src | |
| parent | 2063d89c11c5dbc3b84caf88546c9a088da421b3 (diff) | |
| download | emacs-03bb6a06e1af95f7540a3f11a92dbefea0894804.tar.gz emacs-03bb6a06e1af95f7540a3f11a92dbefea0894804.zip | |
Use long instead of int when casting ABLOCKS_BUSY to
avoid warning.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5a7dd1962b0..660e74e5a03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-09-07 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * alloc.c: Use long instead of int when casting ABLOCKS_BUSY to | ||
| 4 | avoid warning. | ||
| 5 | |||
| 1 | 2003-09-07 Eli Zaretskii <eliz@elta.co.il> | 6 | 2003-09-07 Eli Zaretskii <eliz@elta.co.il> |
| 2 | 7 | ||
| 3 | * editfns.c (region_limit): Support any non-zero value of | 8 | * editfns.c (region_limit): Support any non-zero value of |
diff --git a/src/alloc.c b/src/alloc.c index f73edcd70e9..332e63c4fd2 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -711,7 +711,7 @@ struct ablocks | |||
| 711 | #define ABLOCKS_BASE(abase) (abase) | 711 | #define ABLOCKS_BASE(abase) (abase) |
| 712 | #else | 712 | #else |
| 713 | #define ABLOCKS_BASE(abase) \ | 713 | #define ABLOCKS_BASE(abase) \ |
| 714 | (1 & (int) ABLOCKS_BUSY (abase) ? abase : ((void**)abase)[-1]) | 714 | (1 & (long) ABLOCKS_BUSY (abase) ? abase : ((void**)abase)[-1]) |
| 715 | #endif | 715 | #endif |
| 716 | 716 | ||
| 717 | /* The list of free ablock. */ | 717 | /* The list of free ablock. */ |
| @@ -792,17 +792,17 @@ lisp_align_malloc (nbytes, type) | |||
| 792 | abase->blocks[i].x.next_free = free_ablock; | 792 | abase->blocks[i].x.next_free = free_ablock; |
| 793 | free_ablock = &abase->blocks[i]; | 793 | free_ablock = &abase->blocks[i]; |
| 794 | } | 794 | } |
| 795 | ABLOCKS_BUSY (abase) = (struct ablocks *) aligned; | 795 | ABLOCKS_BUSY (abase) = (struct ablocks *) (long) aligned; |
| 796 | 796 | ||
| 797 | eassert (0 == ((EMACS_UINT)abase) % BLOCK_ALIGN); | 797 | eassert (0 == ((EMACS_UINT)abase) % BLOCK_ALIGN); |
| 798 | eassert (ABLOCK_ABASE (&abase->blocks[3]) == abase); /* 3 is arbitrary */ | 798 | eassert (ABLOCK_ABASE (&abase->blocks[3]) == abase); /* 3 is arbitrary */ |
| 799 | eassert (ABLOCK_ABASE (&abase->blocks[0]) == abase); | 799 | eassert (ABLOCK_ABASE (&abase->blocks[0]) == abase); |
| 800 | eassert (ABLOCKS_BASE (abase) == base); | 800 | eassert (ABLOCKS_BASE (abase) == base); |
| 801 | eassert (aligned == (int)ABLOCKS_BUSY (abase)); | 801 | eassert (aligned == (long) ABLOCKS_BUSY (abase)); |
| 802 | } | 802 | } |
| 803 | 803 | ||
| 804 | abase = ABLOCK_ABASE (free_ablock); | 804 | abase = ABLOCK_ABASE (free_ablock); |
| 805 | ABLOCKS_BUSY (abase) = (struct ablocks *) (2 + (int) ABLOCKS_BUSY (abase)); | 805 | ABLOCKS_BUSY (abase) = (struct ablocks *) (2 + (long) ABLOCKS_BUSY (abase)); |
| 806 | val = free_ablock; | 806 | val = free_ablock; |
| 807 | free_ablock = free_ablock->x.next_free; | 807 | free_ablock = free_ablock->x.next_free; |
| 808 | 808 | ||
| @@ -834,11 +834,11 @@ lisp_align_free (block) | |||
| 834 | ablock->x.next_free = free_ablock; | 834 | ablock->x.next_free = free_ablock; |
| 835 | free_ablock = ablock; | 835 | free_ablock = ablock; |
| 836 | /* Update busy count. */ | 836 | /* Update busy count. */ |
| 837 | ABLOCKS_BUSY (abase) = (struct ablocks *) (-2 + (int) ABLOCKS_BUSY (abase)); | 837 | ABLOCKS_BUSY (abase) = (struct ablocks *) (-2 + (long) ABLOCKS_BUSY (abase)); |
| 838 | 838 | ||
| 839 | if (2 > (int) ABLOCKS_BUSY (abase)) | 839 | if (2 > (long) ABLOCKS_BUSY (abase)) |
| 840 | { /* All the blocks are free. */ | 840 | { /* All the blocks are free. */ |
| 841 | int i = 0, aligned = (int) ABLOCKS_BUSY (abase); | 841 | int i = 0, aligned = (long) ABLOCKS_BUSY (abase); |
| 842 | struct ablock **tem = &free_ablock; | 842 | struct ablock **tem = &free_ablock; |
| 843 | struct ablock *atop = &abase->blocks[aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1]; | 843 | struct ablock *atop = &abase->blocks[aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1]; |
| 844 | 844 | ||