projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformatted.
[chise/xemacs-chise.git-]
/
src
/
malloc.c
diff --git
a/src/malloc.c
b/src/malloc.c
index
9f41290
..
878e340
100644
(file)
--- a/
src/malloc.c
+++ b/
src/malloc.c
@@
-201,10
+201,8
@@
extern void *sbrk ();
extern char *start_of_data (void);
#ifdef BSD
extern char *start_of_data (void);
#ifdef BSD
-#ifndef DATA_SEG_BITS
#define start_of_data() &etext
#endif
#define start_of_data() &etext
#endif
-#endif
#ifndef emacs
#define start_of_data() &etext
#ifndef emacs
#define start_of_data() &etext
@@
-287,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 */
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.
/* Level number of warnings already issued.
0 -- no warnings issued.
@@
-341,7
+339,7
@@
morecore (nu) /* ask system for more memory */
{
char *cp;
int nblks;
{
char *cp;
int nblks;
- unsigned int siz;
+ unsigned long siz;
int oldmask;
#ifdef BSD
int oldmask;
#ifdef BSD
@@
-527,7
+525,7
@@
malloc (n) /* get a block */
#ifdef rcheck
botch ("block on free list clobbered");
#else /* not rcheck */
#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 */
#endif /* not rcheck */
/* Fill in the info, and if range checking, set up the magic numbers */
@@
-571,7
+569,7
@@
free (mem)
#ifndef rcheck
if (p -> mh_alloc != ISALLOC)
#ifndef rcheck
if (p -> mh_alloc != ISALLOC)
- abort ();
+ ABORT ();
#else /* rcheck */
if (p -> mh_alloc != ISALLOC)
#else /* rcheck */
if (p -> mh_alloc != ISALLOC)
@@
-740,7
+738,7
@@
malloc_stats (size)
return v;
}
int
return v;
}
int
-malloc_mem_used ()
+malloc_mem_used (void)
{
int i;
int size_used;
{
int i;
int size_used;
@@
-759,7
+757,7
@@
malloc_mem_used ()
}
int
}
int
-malloc_mem_free ()
+malloc_mem_free (void)
{
int i;
int size_unused;
{
int i;
int size_unused;
@@
-789,7
+787,7
@@
malloc_mem_free ()
#ifdef USG
static void
#ifdef USG
static void
-get_lim_data ()
+get_lim_data (void)
{
#ifdef ULIMIT_BREAK_VALUE
lim_data = ULIMIT_BREAK_VALUE;
{
#ifdef ULIMIT_BREAK_VALUE
lim_data = ULIMIT_BREAK_VALUE;
@@
-804,7
+802,7
@@
get_lim_data ()
#ifndef BSD4_2
static void
#ifndef BSD4_2
static void
-get_lim_data ()
+get_lim_data (void)
{
lim_data = vlimit (LIM_DATA, -1);
}
{
lim_data = vlimit (LIM_DATA, -1);
}
@@
-812,7
+810,7
@@
get_lim_data ()
#else /* BSD4_2 */
static void
#else /* BSD4_2 */
static void
-get_lim_data ()
+get_lim_data (void)
{
struct rlimit XXrlimit;
{
struct rlimit XXrlimit;