diff options
| author | Joakim Verona | 2011-06-16 00:22:07 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-16 00:22:07 +0200 |
| commit | a7513ade3bc0fe79430d5541d88c9dcda0932bec (patch) | |
| tree | 4383951ba698a11e9f8933a9d8c72e00aa872a10 /src/ralloc.c | |
| parent | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (diff) | |
| parent | 4bba86e6210a74326e843a8fdc8409127105e1fe (diff) | |
| download | emacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.tar.gz emacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.zip | |
merge from upstream
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index ee8493b89a4..9c601a0ac24 100644 --- a/src/ralloc.c +++ b/src/ralloc.c | |||
| @@ -648,7 +648,7 @@ resize_bloc (bloc_ptr bloc, SIZE size) | |||
| 648 | else | 648 | else |
| 649 | { | 649 | { |
| 650 | memmove (bloc->new_data, bloc->data, old_size); | 650 | memmove (bloc->new_data, bloc->data, old_size); |
| 651 | memset (bloc->new_data + old_size, 0, size - old_size); | 651 | memset ((char *) bloc->new_data + old_size, 0, size - old_size); |
| 652 | *bloc->variable = bloc->data = bloc->new_data; | 652 | *bloc->variable = bloc->data = bloc->new_data; |
| 653 | } | 653 | } |
| 654 | } | 654 | } |
| @@ -1259,4 +1259,3 @@ r_alloc_init (void) | |||
| 1259 | 1259 | ||
| 1260 | use_relocatable_buffers = 1; | 1260 | use_relocatable_buffers = 1; |
| 1261 | } | 1261 | } |
| 1262 | |||