* cygheap.cc (cygheap_fixup_in_child): Clear cygheap->base so that heap is not

forced to start at the same place in execed process.
* heap.cc: Remove brk* macros for clarity throughout.
* heap.h: Ditto.
* shared.cc (shared_info::initialize): Move heap_chunk test into
heap_chunk_size().
(heap_chunk_size): Check for chunk size here.  Don't go to registry if
heap_chunk_in_mb is already set.
* smallprint.c (console_printf): Add Windows 95 concessions.

1 files changed, 6 insertions, 3 deletions

diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 8d34e671a..c268ebaac 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -153,9 +153,12 @@ struct init_cygheap
 {
   _cmalloc_entry *chain;
   char *buckets[32];
-  void *heapbase;
-  void *heapptr;
-  void *heaptop;
+  struct /* User heap stuff. */
+    {
+      void *heapbase;
+      void *heapptr;
+      void *heaptop;
+    };
   cygheap_root root;
   cygheap_user user;
   mode_t umask;