aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-06-13 21:49:24 -0700
committerPaul Eggert2011-06-13 21:49:24 -0700
commitd96be9fc873bfb4ff7d144c95c577537038e5e26 (patch)
tree4e688c74caa756126b557b201f9aa7bc72980e9e /src
parent3c3a05dfb70656c56f60666a8c32a28d85f072fb (diff)
downloademacs-d96be9fc873bfb4ff7d144c95c577537038e5e26.tar.gz
emacs-d96be9fc873bfb4ff7d144c95c577537038e5e26.zip
* vm-limit.c (check_memory_limits): Fix incorrect extern function decls.
* mem-limits.h (SIZE): Remove; no longer used.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/mem-limits.h2
-rw-r--r--src/vm-limit.c5
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 43e1f9dbc06..3d137a16a4c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-06-14 Paul Eggert <eggert@cs.ucla.edu>
2
3 * vm-limit.c (check_memory_limits): Fix incorrect extern function decls.
4 * mem-limits.h (SIZE): Remove; no longer used.
5
12011-06-13 Paul Eggert <eggert@cs.ucla.edu> 62011-06-13 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works. 8 * xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works.
diff --git a/src/mem-limits.h b/src/mem-limits.h
index aa3a13c1c34..86b2f44846d 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -33,8 +33,6 @@ extern int etext;
33# endif 33# endif
34#endif 34#endif
35 35
36typedef unsigned long SIZE;
37
38extern char *start_of_data (void); 36extern char *start_of_data (void);
39#if defined USE_LSB_TAG 37#if defined USE_LSB_TAG
40#define EXCEEDS_LISP_PTR(ptr) 0 38#define EXCEEDS_LISP_PTR(ptr) 0
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 4694608602f..846946b41c1 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -166,9 +166,9 @@ static void
166check_memory_limits (void) 166check_memory_limits (void)
167{ 167{
168#ifdef REL_ALLOC 168#ifdef REL_ALLOC
169 extern POINTER (*real_morecore) (SIZE); 169 extern POINTER (*real_morecore) (long);
170#endif 170#endif
171 extern POINTER (*__morecore) (SIZE); 171 extern POINTER (*__morecore) (long);
172 172
173 register POINTER cp; 173 register POINTER cp;
174 unsigned long five_percent; 174 unsigned long five_percent;
@@ -297,4 +297,3 @@ memory_warnings (POINTER start, void (*warnfun) (const char *))
297 /* Force data limit to be recalculated on each run. */ 297 /* Force data limit to be recalculated on each run. */
298 lim_data = 0; 298 lim_data = 0;
299} 299}
300