diff --git a/src/ChangeLog b/src/ChangeLog index 43e1f9dbc06..3d137a16a4c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-06-14 Paul Eggert + + * vm-limit.c (check_memory_limits): Fix incorrect extern function decls. + * mem-limits.h (SIZE): Remove; no longer used. + 2011-06-13 Paul Eggert * 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; # endif #endif -typedef unsigned long SIZE; - extern char *start_of_data (void); #if defined USE_LSB_TAG #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 check_memory_limits (void) { #ifdef REL_ALLOC - extern POINTER (*real_morecore) (SIZE); + extern POINTER (*real_morecore) (long); #endif - extern POINTER (*__morecore) (SIZE); + extern POINTER (*__morecore) (long); register POINTER cp; unsigned long five_percent; @@ -297,4 +297,3 @@ memory_warnings (POINTER start, void (*warnfun) (const char *)) /* Force data limit to be recalculated on each run. */ lim_data = 0; } -