Mercurial > hg > xemacs-beta

diff src/malloc.c @ 412:697ef44129c6 r21-2-14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-14
author cvs
date Mon, 13 Aug 2007 11:20:41 +0200
parents 2f8bb876ab1d
children
line wrap: on
line diff
--- a/src/malloc.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/malloc.c	Mon Aug 13 11:20:41 2007 +0200
@@ -201,8 +201,10 @@
 extern char *start_of_data (void);
 
 #ifdef BSD
+#ifndef DATA_SEG_BITS
 #define start_of_data() &etext
 #endif
+#endif
 
 #ifndef emacs
 #define start_of_data() &etext
@@ -738,7 +740,7 @@
   return v;
 }
 int
-malloc_mem_used (void)
+malloc_mem_used ()
 {
   int i;
   int size_used;
@@ -757,7 +759,7 @@
 }
 
 int 
-malloc_mem_free (void)
+malloc_mem_free ()
 {
   int i;
   int size_unused;
@@ -787,7 +789,7 @@
 #ifdef USG
 
 static void
-get_lim_data (void)
+get_lim_data ()
 {
 #ifdef ULIMIT_BREAK_VALUE
   lim_data = ULIMIT_BREAK_VALUE;
@@ -802,7 +804,7 @@
 #ifndef BSD4_2
 
 static void
-get_lim_data (void)
+get_lim_data ()
 {
   lim_data = vlimit (LIM_DATA, -1);
 }
@@ -810,7 +812,7 @@
 #else /* BSD4_2 */
 
 static void
-get_lim_data (void)
+get_lim_data ()
 {
   struct rlimit XXrlimit;