--- a/src/gmalloc.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 11:35:02 2007 +0200
@@ -25,8 +25,6 @@
 # define STDC_HEADERS
 #endif
 
-#define __const const
-
 
 /* 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 @@
 
 /* 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 @@
 #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 ()
 {
-#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 @@
   int type;
   __malloc_size_t block, blocks, oldlimit;
 
-  if (PURE_DATA(ptr))
+  if (PURE_DATA (ptr))
     {
       result = malloc (size);
       memcpy(result, ptr, size);