* cygheap.cc (init_cygheap::init_installation_root): Convert function

	init_installation_root into a cygheap method.
	* cygheap.h (struct init_cygheap): Move installation_root,
	installation_key, and installation_key_buf from shared
	.cygwin_dll_common DLL section to cygheap.  Declare new method
	init_installation_root.
	* dtable.cc (handle_to_fn): Accommodate the move of installation strings
	to the cygheap.
	* external.cc (cygwin_internal): Ditto.
	* fhandler_console.cc (fhandler_console::open_shared_console): Ditto.
	* fhandler_mailslot.cc (fhandler_mailslot::get_object_attr): Ditto.
	* fhandler_tty.cc: Ditto, throughout.
	* mount.cc (mount_info::init): Ditto.
	* pipe.cc (fhandler_pipe::create): Ditto.
	* shared.cc: Ditto, throughout.
	(installation_root): Remove.
	(installation_key): Move to cygheap.
	(installation_key_buf): Ditto.
	(installation_root_inited): Remove.
	(SPIN_WAIT): Remove.
	(init_installation_root): Move to cygheap.
	(memory_init): Call cygheap->init_installation_root right after
	cygheap->user.init.  Drop call of init_installation_root function.
	* shared_info.h (init_installation_root): Drop declaration.
	(installation_root): Ditto.
	(installation_key): Ditto.
	* uinfo.cc (pwdgrp::load): Accommodate the move of installation strings
	to the cygheap.

1 files changed, 4 insertions, 0 deletions

diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 7c2380e4d..054297bd7 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -280,6 +280,9 @@ struct init_cygheap: public mini_cygheap
 {
   _cmalloc_entry *chain;
   char *buckets[32];
+  WCHAR installation_root[PATH_MAX];
+  UNICODE_STRING installation_key;
+  WCHAR installation_key_buf[18];
   cygheap_root root;
   cygheap_user user;
   user_heap_info user_heap;
@@ -303,6 +306,7 @@ struct init_cygheap: public mini_cygheap
   } inode_list;			/* Global inode pointer for adv. locking. */
   hook_chain hooks;
   void close_ctty ();
+  void init_installation_root ();
 };