(U-0002195D): Add `ideographic-structure'; add `sound@ja/on'; add

[chise/xemacs-chise.git.1] / src / gmalloc.c

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 56badba..a65e78e 100644 (file)
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -25,8 +25,6 @@
 # define STDC_HEADERS
 #endif
 
-#define __const const
-
 \f
 /* DO NOT EDIT THIS FILE -- it is automagically generated.  -*- C -*- */
 /* Bwaa-haa-haa!  Not a chance that this is actually true! */
@@ -273,7 +271,7 @@ extern struct mstats mstats __P ((void));
 
 /* Call WARNFUN with a warning message when memory usage is high.  */
 extern void memory_warnings __P ((__ptr_t __start,
-                                 void (*__warnfun) __P ((__const char *))));
+                                 void (*__warnfun) __P ((const char *))));
 
 
 #if 0 /* unused in this file, and conflicting prototypes anyway */
@@ -369,7 +367,7 @@ Boston, MA 02111-1307, USA.
 #endif
 
 /* How to really get more memory.  */
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
 /* once dumped, free() & realloc() on static heap space will fail */
 #define PURE_DATA(x) \
 ((static_heap_dumped && (char*)x >= static_heap_base \
@@ -448,7 +446,7 @@ static int initialize __P ((void));
 static int
 initialize ()
 {
-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)
   if (static_heap_dumped && __morecore == more_static_core)
     {
       __morecore = __default_morecore;
@@ -1038,7 +1036,7 @@ realloc (__ptr_t ptr, __malloc_size_t size)
   int type;
   __malloc_size_t block, blocks, oldlimit;
 
-  if (PURE_DATA(ptr))
+  if (PURE_DATA (ptr))
     {
       result = malloc (size);
       memcpy(result, ptr, size);
@@ -1234,23 +1232,9 @@ extern __ptr_t __sbrk __P ((int increment));
    and return the start of data space, or NULL on errors.
    If INCREMENT is negative, shrink data space.  */
 __ptr_t
-__default_morecore (
-#ifdef __STDC__
-     ptrdiff_t increment
-#else
-#ifdef OSF1
-     long increment
-#else
-     int increment
-#endif
-#endif
-     )
+__default_morecore (ptrdiff_t increment)
 {
-#ifdef OSF1
-  __ptr_t result = (__ptr_t) __sbrk ((ssize_t) increment);
-#else
-  __ptr_t result = (__ptr_t) __sbrk ((int) increment);
-#endif
+  __ptr_t result = (__ptr_t) __sbrk (increment);
   if (result == (__ptr_t) -1)
     return NULL;
   return result;