projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(decoding_table_remove_char): Change arguments to hide decoding_table
[chise/xemacs-chise.git-]
/
src
/
gmalloc.c
diff --git
a/src/gmalloc.c
b/src/gmalloc.c
index
472bd3f
..
a65e78e
100644
(file)
--- a/
src/gmalloc.c
+++ b/
src/gmalloc.c
@@
-367,7
+367,7
@@
Boston, MA 02111-1307, USA.
#endif
/* How to really get more memory. */
#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 \
/* once dumped, free() & realloc() on static heap space will fail */
#define PURE_DATA(x) \
((static_heap_dumped && (char*)x >= static_heap_base \
@@
-446,7
+446,7
@@
static int initialize __P ((void));
static int
initialize ()
{
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;
if (static_heap_dumped && __morecore == more_static_core)
{
__morecore = __default_morecore;
@@
-1036,7
+1036,7
@@
realloc (__ptr_t ptr, __malloc_size_t size)
int type;
__malloc_size_t block, blocks, oldlimit;
int type;
__malloc_size_t block, blocks, oldlimit;
- if (PURE_DATA(ptr))
+ if (PURE_DATA (ptr))
{
result = malloc (size);
memcpy(result, ptr, size);
{
result = malloc (size);
memcpy(result, ptr, size);
@@
-1232,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
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;
if (result == (__ptr_t) -1)
return NULL;
return result;