* Makefile.in (DLL_IMPORTS): Add libntdll.a.

	* autoload.cc: Remove all symbols from advapi32.dll, kernel32.dll and
	ntdll.dll available on all platforms since NT4.

	Throughout remove all usage of wincap.is_winnt.
	* dcrt0.cc (dll_crt0_0): Remove call to mmap_init.
	* fhandler.h (class fhandler_base): Remove has_changed flag.
	(fhandler_disk_file::touch_ctime): Remove declaration.
	(fhandler_disk_file::readdir_9x): Ditto.
	(fhandler_disk_file::touch_ctime): Remove.
	(fhandler_disk_file::readdir_9x): Remove.
	(fhandler_disk_file::closedir): Call NtClose instead of CloseHandle.
	* mmap.cc: Throughout call CreateMapping and MapView directly.
	(VirtualProt9x): Remove.
	(VirtualProtNT): Remove.
	(VirtualProtEx9x): Remove.
	(VirtualProtExNT): Remove.
	(VirtualProtect): Remove define.
	(VirtualProtectEx): Remove define.
	(CreateMapping9x): Remove.
	(CreateMappingNT): Rename to CreateMapping.
	(MapView9x): Remove.
	(MapViewNT): Rename to MapView.
	(struct mmap_func_t): Remove definition.
	(mmap_funcs_9x): Remove.
	(mmap_funcs_nt): Remove.
	(mmap_func): Remove.
	(mmap_init): Remove.
	* net.cc (getdomainname): Drop comment. Use NT4 registry key only.
	(get_95_ifconf): Remove.
	* pinfo.cc (winpids::enumNT): Rename to winpids::enum_processes.
	(winpids::enum9x): Remove.
	(winpids::set): Just call enum_processes directly.
	(winpids::enum_init): Ditto.
	* pinfo.h (class winpids): Drop enum_processes pointer.  Rename
	enumNT to enum_processes.  Drop enum9x declaration.  Drop initialization
	of enum_processes throughout.
	* registry.cc (get_registry_hive_path): Just create NT key.
	(load_registry_hive): Only load NT specific file.
	* syscalls.cc (unlink_9x): Remove.
	(unlink): Just call unlink_nt.
	* wincap.cc: Remove is_winnt flag throughout.
	* wincap.h: Ditto.
	* winsup.h: Remove mmap_init declaration.

1 files changed, 3 insertions, 12 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 0cc3a3000..c72e2428b 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -231,14 +231,6 @@ try_to_bin (path_conv &win32_path, HANDLE h)
 		  recycler, status);
 }
 
-static DWORD
-unlink_9x (path_conv &win32_name)
-{
-  BOOL ret = DeleteFile (win32_name);
-  syscall_printf ("DeleteFile %s", ret ? "succeeded" : "failed");
-  return GetLastError ();
-}
-
 DWORD
 unlink_nt (path_conv &win32_name, bool setattrs)
 {
@@ -344,6 +336,7 @@ unlink (const char *ourname)
 {
   int res = -1;
   DWORD devn;
+  DWORD lasterr;
 
   path_conv win32_name (ourname, PC_SYM_NOFOLLOW,
 			transparent_exe ? stat_suffixes : NULL);
@@ -391,9 +384,7 @@ unlink (const char *ourname)
 					| FILE_ATTRIBUTE_HIDDEN));
     }
 
-  DWORD lasterr;
-  lasterr = wincap.is_winnt () ? unlink_nt (win32_name, setattrs)
-			       : unlink_9x (win32_name);
+  lasterr = unlink_nt (win32_name, setattrs);
   if (!lasterr)
     res = 0;
   else
@@ -1172,7 +1163,7 @@ sync ()
 	  FindVolumeClose (sh);
 	}
     }
-  else if (wincap.is_winnt ())	/* 9x has no concept for opening volumes */
+  else
     {
       DWORD drives = GetLogicalDrives ();
       DWORD mask = 1;