aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2001-09-09 20:00:29 +0000
committerChristopher Faylor <me@cgf.cx>2001-09-09 20:00:29 +0000
commit3800a9e7d7906a46433c33eb8694b93b1c78bc6f (patch)
tree88e460d3e8f870f0ff10ce7b39a5ae7a1172a526 /winsup
parentde05a524ca9636914d8c228551f27feb6b509c4d (diff)
downloadnewlib-3800a9e7d7906a46433c33eb8694b93b1c78bc6f.zip
newlib-3800a9e7d7906a46433c33eb8694b93b1c78bc6f.tar.gz
newlib-3800a9e7d7906a46433c33eb8694b93b1c78bc6f.tar.bz2
* heap.h (inheap): Rewrite macro to accomodate removal of brk macros below.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/heap.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 73085b0..22ae600 100644
--- 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 96046cb..ce16e13 100644
--- 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))