aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab <[email protected]>2005-05-16 15:17:55 +0000
committerAndreas Schwab <[email protected]>2005-05-16 15:17:55 +0000
commit0da46b6eeabfc8afda14232976c2f823bce58491 (patch)
tree3159d20f97470295acd6c39008e845555130eaaa /src
parentb376642de60772f2aa1d2e5b540c70882ff2dd5f (diff)
(unexec_realloc): Move declarations before statements.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/unexmacosx.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fd11243cbb..66e4a8e4f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-16 Andreas Schwab <[email protected]>
+
+ * unexmacosx.c (unexec_realloc): Move declarations before
+ statements.
+
2005-05-14 Richard M. Stallman <[email protected]>
* xdisp.c (message3): Call cancel_echoing.
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index fc369eab7c..e54dbea448 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,5 +1,5 @@
/* Dump Emacs in Mach-O format for use on Mac OS X.
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -1069,10 +1069,10 @@ unexec_realloc (void *old_ptr, size_t new_size)
if (ptr_in_unexec_regions (old_ptr))
{
- p = (size_t *) malloc (new_size);
size_t old_size = ((unexec_malloc_header_t *) old_ptr)[-1].u.size;
size_t size = new_size > old_size ? old_size : new_size;
+ p = (size_t *) malloc (new_size);
if (size)
memcpy (p, old_ptr, size);
}