Index: winsup//cygwin/dlmalloc.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/dlmalloc.h,v
retrieving revision 1.2
diff -c -r1.2 dlmalloc.h
*** winsup//cygwin/dlmalloc.h	24 Jun 2001 22:26:50 -0000	1.2
--- winsup//cygwin/dlmalloc.h	13 Jun 2003 00:54:06 -0000
***************
*** 12,17 ****
--- 12,18 ----
  void malloc_outofmem(void (*)(void));
  
  
+ #if 0
  struct mallinfo {
    int arena;    /* total space allocated from system */
    int ordblks;  /* number of non-inuse chunks */
***************
*** 24,29 ****
--- 25,31 ----
    int fordblks; /* total non-inuse space */
    int keepcost; /* top-most, releasable (via malloc_trim) space */
  };
+ #endif
  
  
  #define M_MXFAST  1    /* UNUSED in this malloc */
Index: winsup//cygwin/malloc_wrapper.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/malloc_wrapper.cc,v
retrieving revision 1.24
diff -c -r1.24 malloc_wrapper.cc
*** winsup//cygwin/malloc_wrapper.cc	22 Feb 2003 23:02:15 -0000	1.24
--- winsup//cygwin/malloc_wrapper.cc	13 Jun 2003 00:54:06 -0000
***************
*** 38,43 ****
--- 38,44 ----
  static int use_internal_malloc = 1;
  
  #ifdef MALLOC_DEBUG
+ #ifndef __CYGWIN__
  extern "C" void * _sbrk (size_t incr_arg);
  
  #if 0
***************
*** 82,88 ****
    assert (inheap (p));
    return realloc (p, size);
  }
- #undef realloc
  
  extern "C" char *
  strdup_dbg (const char *s, const char *file, int line)
--- 83,88 ----
***************
*** 100,107 ****
  {
    return strdup_dbg (s, __FILE__, __LINE__);
  }
! #else
! #endif
  /* These routines are used by the application if it
     doesn't provide its own malloc. */
  
--- 100,107 ----
  {
    return strdup_dbg (s, __FILE__, __LINE__);
  }
! #endif // __CYGWIN__
! #else // ! MALLOC_DEBUG
  /* These routines are used by the application if it
     doesn't provide its own malloc. */
  
***************
*** 293,298 ****
--- 293,299 ----
  
    return m;
  }
+ #endif // ! MALLOC_DEBUG
  
  extern "C" char *
  strdup (const char *s)
Index: winsup//cygwin/path.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/path.cc,v
retrieving revision 1.255
diff -c -r1.255 path.cc
*** winsup//cygwin/path.cc	4 Jun 2003 22:59:55 -0000	1.255
--- winsup//cygwin/path.cc	13 Jun 2003 00:54:06 -0000
***************
*** 74,79 ****
--- 74,80 ----
  #include "shared_info.h"
  #include "registry.h"
  #include <assert.h>
+ #include <malloc.h>
  
  #ifdef _MT_SAFE
  #define iteration _reent_winsup ()->_iteration
Index: winsup//cygwin/spawn.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.123
diff -c -r1.123 spawn.cc
*** winsup//cygwin/spawn.cc	9 Jun 2003 13:29:12 -0000	1.123
--- winsup//cygwin/spawn.cc	13 Jun 2003 00:54:07 -0000
***************
*** 35,40 ****
--- 35,41 ----
  #include "registry.h"
  #include "environ.h"
  #include "cygthread.h"
+ #include <malloc.h>
  
  #define LINE_BUF_CHUNK (MAX_PATH * 2)
  
Index: winsup//cygwin/syscalls.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/syscalls.cc,v
retrieving revision 1.271
diff -c -r1.271 syscalls.cc
*** winsup//cygwin/syscalls.cc	26 May 2003 16:52:58 -0000	1.271
--- winsup//cygwin/syscalls.cc	13 Jun 2003 00:54:08 -0000
***************
*** 58,63 ****
--- 58,64 ----
  #include "pwdgrp.h"
  #include "cpuid.h"
  #include "registry.h"
+ #include <malloc.h>
  
  #undef _close
  #undef _lseek