HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Variadic C functions now count arguments with size_t, not int.
[bpt/emacs.git]
/
src
/
ralloc.c
diff --git
a/src/ralloc.c
b/src/ralloc.c
index
9b5e3bb
..
9c601a0
100644
(file)
--- a/
src/ralloc.c
+++ b/
src/ralloc.c
@@
-1,6
+1,5
@@
/* Block-relocating memory allocator.
/* Block-relocating memory allocator.
- Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1995, 2000-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-649,7
+648,7
@@
resize_bloc (bloc_ptr bloc, SIZE size)
else
{
memmove (bloc->new_data, bloc->data, old_size);
else
{
memmove (bloc->new_data, bloc->data, old_size);
- memset (bloc->new_data + old_size, 0, size - old_size);
+ memset (
(char *)
bloc->new_data + old_size, 0, size - old_size);
*bloc->variable = bloc->data = bloc->new_data;
}
}
*bloc->variable = bloc->data = bloc->new_data;
}
}
@@
-1260,6
+1259,3
@@
r_alloc_init (void)
use_relocatable_buffers = 1;
}
use_relocatable_buffers = 1;
}
-
-/* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
- (do not change this comment) */