User: ben
Date: 05/09/30 04:15:10
Modified: xemacs/src ChangeLog alloca.c
Log:
fix --disable-debug error
alloca.c: Don't declare a variable `register' when it can be passed to
xfree(), which may take its address.
new -> new_.
Revision Changes Path
1.865 +30 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -p -r1.864 -r1.865
--- ChangeLog 2005/09/29 11:41:21 1.864
+++ ChangeLog 2005/09/30 02:15:06 1.865
@@ -1,3 +1,33 @@
+2005-09-29 Ben Wing <ben(a)xemacs.org>
+
+ * alloca.c (xemacs_c_alloca):
+ Don't declare a variable `register' when it can be passed to
+ xfree(), which may take its address.
+
+ new -> new_.
+
+2005-09-27 Ben Wing <ben(a)xemacs.org>
+
+ * alloc.c (garbage_collect_1):
+ Avoid use of reserved C++ `catch'.
+
+ * alloc.c:
+ * alloc.c (gc_plist_hack):
+ * alloc.c (HACK_O_MATIC):
+ * alloc.c (Fgarbage_collect):
+ * alloc.c (Ftotal_memory_usage):
+ * alloc.c (Flisp_object_memory_usage):
+ * alloc.c (recompute_need_to_garbage_collect):
+ * alloc.c (common_init_alloc_early):
+ * alloc.c (syms_of_alloc):
+ * alloc.c (vars_of_alloc):
+ Rename underused `memory-usage' to `total-memory-usage'.
+ Add `lisp-object-memory-usage'. Reimplement `gc-cons-percentage'
+ to be a percentage of total Lisp object allocation (not total
+ memory of all sorts, which is hard to calculate in any case) and
+ give it a preliminary value of 40%. Use EMACS_INT instead of
+ int in a couple of places.
+
2005-09-26 Marcus Crestani <crestani(a)xemacs.org>
* symbols.c (check_module_subr): Fix new allocator's module
1.10 +7 -7 XEmacs/xemacs/src/alloca.c
Index: alloca.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloca.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- alloca.c 2005/01/24 23:33:46 1.9
+++ alloca.c 2005/09/30 02:15:08 1.10
@@ -143,7 +143,7 @@ xemacs_c_alloca (unsigned int size)
was allocated from deeper in the stack than currently. */
{
- register header *hp; /* Traverses linked list. */
+ header *hp; /* Traverses linked list. */
for (hp = last_alloca_header; hp != NULL;)
if ((STACK_DIR > 0 && hp->h.deep > depth)
@@ -177,20 +177,20 @@ xemacs_c_alloca (unsigned int size)
{
#ifdef emacs
- register pointer new = xmalloc (sizeof (header) + size);
+ register pointer new_ = xmalloc (sizeof (header) + size);
#else
- register pointer new = malloc (sizeof (header) + size);
+ register pointer new_ = malloc (sizeof (header) + size);
#endif
/* Address of header. */
- ((header *) new)->h.next = last_alloca_header;
- ((header *) new)->h.deep = depth;
+ ((header *) new_)->h.next = last_alloca_header;
+ ((header *) new_)->h.deep = depth;
- last_alloca_header = (header *) new;
+ last_alloca_header = (header *) new_;
/* User storage begins just after header. */
- return (pointer) ((char *) new + sizeof (header));
+ return (pointer) ((char *) new_ + sizeof (header));
}
}
Show replies by date