1 files changed, 1 insertions, 40 deletions

diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index fb2d8e821..6e01967f8 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -9,31 +9,7 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "hires.h"
-
-#undef cfree
-
-enum cygheap_types
-{
-  HEAP_FHANDLER,
-  HEAP_STR,
-  HEAP_ARGV,
-  HEAP_BUF,
-  HEAP_MOUNT,
-  HEAP_SIGS,
-  HEAP_ARCHETYPES,
-  HEAP_TLS,
-  HEAP_COMMUNE,
-  HEAP_1_START,
-  HEAP_1_HOOK,
-  HEAP_1_STR,
-  HEAP_1_ARGV,
-  HEAP_1_BUF,
-  HEAP_1_EXEC,
-  HEAP_1_MAX = 100,
-  HEAP_2_STR,
-  HEAP_2_DLL,
-  HEAP_MMAP = 200
-};
+#include "cygheap_malloc.h"
 
 #define incygheap(s) (cygheap && ((char *) (s) >= (char *) cygheap) && ((char *) (s) <= ((char *) cygheap_max)))
 
@@ -437,21 +413,6 @@ class cygheap_fdenum : public cygheap_fdmanip
   }
 };
 
-class child_info;
 void __stdcall cygheap_fixup_in_child (bool);
-extern "C" {
-void __stdcall cfree (void *) __attribute__ ((regparm(1)));
-void *__stdcall cmalloc (cygheap_types, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall crealloc (void *, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall ccalloc (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3)));
-void *__stdcall cmalloc_abort (cygheap_types, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall crealloc_abort (void *, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall ccalloc_abort (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3)));
-PWCHAR __stdcall cwcsdup (const PWCHAR) __attribute__ ((regparm(1)));
-PWCHAR __stdcall cwcsdup1 (const PWCHAR) __attribute__ ((regparm(1)));
-char *__stdcall cstrdup (const char *) __attribute__ ((regparm(1)));
-char *__stdcall cstrdup1 (const char *) __attribute__ ((regparm(1)));
-void __stdcall cfree_and_set (char *&, char * = NULL) __attribute__ ((regparm(2)));
 void __stdcall cygheap_init ();
 extern char _cygheap_start[] __attribute__((section(".idata")));
-}