* heap.h (inheap): Rewrite macro to accomodate removal of brk macros below.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 73085b0a97bebaeaa3f409ab4778ff10093dd583..22ae6003b6decc19ca71cacaa47f5225a22f93c2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep  9 15:59:53 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * heap.h (inheap): Rewrite macro to accomodate removal of brk macros
+       below.
+
 Sun Sep  9 15:02:44 2001  Christopher Faylor <cgf@cygnus.com>
 
        * cygheap.cc (cygheap_fixup_in_child): Clear cygheap->base so that heap

diff --git a/winsup/cygwin/heap.h b/winsup/cygwin/heap.h
index 96046cbb9a10776353782da7d44bd5559632f42d..ce16e13338654d89671a1cdb35e1ae89e88c2457 100644 (file)
--- a/winsup/cygwin/heap.h
+++ b/winsup/cygwin/heap.h
@@ -14,4 +14,6 @@ details. */
 void heap_init ();
 void malloc_init ();
 
-#define inheap(s) (brk && ((char *) (s) >= (char *) brkbase) && ((char *) (s) <= (char *) brktop))
+#define inheap(s) \
+  (cygheap->heapptr && ((char *) (s) >= (char *) cygheap->heapbase) \
+   && ((char *) (s) <= (char *) cygheap->heaptop))