aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-02-19 12:20:08 +0000
committerGerd Moellmann2001-02-19 12:20:08 +0000
commitaeac019e2f2b9e6a13fc50d9a7291131754a26ed (patch)
tree095f22033db080302eed40f1a410651b5901fa36 /src
parent94c3309fd57b66787d4d2d4b39560b2527af60d1 (diff)
downloademacs-aeac019e2f2b9e6a13fc50d9a7291131754a26ed.tar.gz
emacs-aeac019e2f2b9e6a13fc50d9a7291131754a26ed.zip
(__morecore) [!SYSTEM_MALLOC]: Move declaration
to the start of the file.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/ralloc.c16
2 files changed, 13 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c1e2b123f4..44015eb9296 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-02-19 Gerd Moellmann <gerd@gnu.org>
2
3 * ralloc.c (__morecore) [!SYSTEM_MALLOC]: Move declaration
4 to the start of the file.
5
12001-02-16 Gerd Moellmann <gerd@gnu.org> 62001-02-16 Gerd Moellmann <gerd@gnu.org>
2 7
3 * window.c (set_window_buffer): Fix last change. 8 * window.c (set_window_buffer): Fix last change.
diff --git a/src/ralloc.c b/src/ralloc.c
index 2e9004baa2f..9d31320bfcf 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -114,6 +114,14 @@ static int extra_bytes;
114#define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \ 114#define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
115 & ~(MEM_ALIGN - 1)) 115 & ~(MEM_ALIGN - 1))
116 116
117/* The hook `malloc' uses for the function which gets more space
118 from the system. */
119
120#ifndef SYSTEM_MALLOC
121extern POINTER (*__morecore) ();
122#endif
123
124
117 125
118/*********************************************************************** 126/***********************************************************************
119 Implementation using sbrk 127 Implementation using sbrk
@@ -1222,14 +1230,6 @@ r_alloc_check ()
1222 Initialization 1230 Initialization
1223 ***********************************************************************/ 1231 ***********************************************************************/
1224 1232
1225/* The hook `malloc' uses for the function which gets more space
1226 from the system. */
1227
1228#ifndef SYSTEM_MALLOC
1229extern POINTER (*__morecore) ();
1230#endif
1231
1232
1233/* Initialize various things for memory allocation. */ 1233/* Initialize various things for memory allocation. */
1234 1234
1235static void 1235static void