From 60136eb0b28717fb8e861c51f5a798c495960a06 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 17 Sep 2001 03:05:05 +0000
Subject: [PATCH] * dtable.h (not_open): Assure inline. * fhandler.h (operator
 []): Make const. * sync.cc (muto::~muto): Fix typo which stopped muto event
 handle from ever being closed.

---
 winsup/cygwin/ChangeLog | 10 ++++++++++
 winsup/cygwin/cygwin.sc |  2 +-
 winsup/cygwin/dtable.h  |  4 ++--
 winsup/cygwin/sync.cc   |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9f611e76e..54fe58db2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+Sun Sep 16 23:04:31 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* dtable.h (not_open): Assure inline.
+	* fhandler.h (operator []): Make const.
+
+Sun Sep 16 23:02:57 2001  Robert Collins <rbtcollins@hotmail.com>
+
+	* sync.cc (muto::~muto): Fix typo which stopped muto event handle from
+	ever being closed.
+
 2001-09-16  Egor Duda  <deo@logos-m.ru>
 
 	* path.cc (symlink): Check arguments for validity.
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index 2ab447196..43d880c06 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -105,7 +105,7 @@ SECTIONS
   }
   .cygheap BLOCK(64 * 1024) :
   {
+    __system_dlls__ = ABSOLUTE(.) ;
     __cygheap_start = ABSOLUTE(.) ;
-    __system_dlls__ = ABSOLUTE(.) + 64;
   } 
 }
diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/dtable.h
index bfeffa36b..1a51c9249 100644
--- a/winsup/cygwin/dtable.h
+++ b/winsup/cygwin/dtable.h
@@ -50,7 +50,7 @@ public:
   fhandler_base *build_fhandler (int fd, DWORD dev, const char *name,
 				 int unit = -1);
   fhandler_base *build_fhandler (int fd, const char *name, HANDLE h);
-  int not_open (int fd)
+  inline int not_open (int fd)
   {
     SetResourceLock (LOCK_FD_LIST, READ_LOCK, "not_open");
 
@@ -65,7 +65,7 @@ public:
   void init_std_file_from_handle (int fd, HANDLE handle, DWORD access, const char *name);
   int dup2 (int oldfd, int newfd);
   void fixup_after_exec (HANDLE);
-  inline fhandler_base *operator [](int fd) { return fds[fd]; }
+  inline fhandler_base *operator [](int fd) const { return fds[fd]; }
   select_record *select_read (int fd, select_record *s);
   select_record *select_write (int fd, select_record *s);
   select_record *select_except (int fd, select_record *s);
diff --git a/winsup/cygwin/sync.cc b/winsup/cygwin/sync.cc
index 78df35475..743ee02e7 100644
--- a/winsup/cygwin/sync.cc
+++ b/winsup/cygwin/sync.cc
@@ -47,7 +47,7 @@ muto::~muto ()
     release ();
 
   HANDLE h = bruteforce;
-  h = NULL;
+  bruteforce = NULL;
   /* Just need to close the event handle */
   if (h)
     CloseHandle (h);