X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmalloc.c;h=878e3405e8823cd8e88255e107a81be4e92f0bbd;hb=09b372c3074a7cc339a61b2297583f2b9edefe86;hp=599110a8e5652a0d20b8bc82c5fc2f1b060841fb;hpb=3890a2e3064a7f562107c58e59d928284ec04741;p=chise%2Fxemacs-chise.git.1 diff --git a/src/malloc.c b/src/malloc.c index 599110a..878e340 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -285,7 +285,7 @@ static struct mhead *nextf[30]; static char busy[30]; /* Number of bytes of writable memory we can expect to be able to get */ -extern unsigned int lim_data; +extern unsigned long lim_data; /* Level number of warnings already issued. 0 -- no warnings issued. @@ -339,7 +339,7 @@ morecore (nu) /* ask system for more memory */ { char *cp; int nblks; - unsigned int siz; + unsigned long siz; int oldmask; #ifdef BSD @@ -525,7 +525,7 @@ malloc (n) /* get a block */ #ifdef rcheck botch ("block on free list clobbered"); #else /* not rcheck */ - abort (); + ABORT (); #endif /* not rcheck */ /* Fill in the info, and if range checking, set up the magic numbers */ @@ -569,7 +569,7 @@ free (mem) #ifndef rcheck if (p -> mh_alloc != ISALLOC) - abort (); + ABORT (); #else /* rcheck */ if (p -> mh_alloc != ISALLOC) @@ -738,7 +738,7 @@ malloc_stats (size) return v; } int -malloc_mem_used () +malloc_mem_used (void) { int i; int size_used; @@ -757,7 +757,7 @@ malloc_mem_used () } int -malloc_mem_free () +malloc_mem_free (void) { int i; int size_unused; @@ -787,7 +787,7 @@ malloc_mem_free () #ifdef USG static void -get_lim_data () +get_lim_data (void) { #ifdef ULIMIT_BREAK_VALUE lim_data = ULIMIT_BREAK_VALUE; @@ -802,7 +802,7 @@ get_lim_data () #ifndef BSD4_2 static void -get_lim_data () +get_lim_data (void) { lim_data = vlimit (LIM_DATA, -1); } @@ -810,7 +810,7 @@ get_lim_data () #else /* BSD4_2 */ static void -get_lim_data () +get_lim_data (void) { struct rlimit XXrlimit;