diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-26 12:22:41 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-26 12:22:41 +0000 |
| commit | 457c7938f020cabd6029ab976ccfc35ba86d5369 (patch) | |
| tree | d5a05ad641701a4f70e01a9addbe707e14bba237 /winsup/cygwin/libc/minires-os-if.c | |
| parent | d9edc05f47edef645e8b80abdd937820a41d51d4 (diff) | |
| download | cygnal-457c7938f020cabd6029ab976ccfc35ba86d5369.tar.gz cygnal-457c7938f020cabd6029ab976ccfc35ba86d5369.tar.bz2 cygnal-457c7938f020cabd6029ab976ccfc35ba86d5369.zip | |
* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Drop comment.
* mmap.cc (gen_access): Remove.
(mmap_record::gen_access): Remove.
(mmap64): Don't mention 9x any longer.
* syscalls.cc (statvfs): Drop status code consideration for 9x.
* libc/minires-os-if.c (get_registry_dns_items): Don't mention 9x any
longer.
(get_registry_dns): Drop getting registry key on 9x. Drop is9x
variable.
Diffstat (limited to 'winsup/cygwin/libc/minires-os-if.c')
| -rw-r--r-- | winsup/cygwin/libc/minires-os-if.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c index a5ab4a4f6..540d78634 100644 --- a/winsup/cygwin/libc/minires-os-if.c +++ b/winsup/cygwin/libc/minires-os-if.c @@ -347,8 +347,7 @@ static void get_registry_dns_items(HKEY hKey, LPCTSTR KeyValue, get_registry_dns: Read the registry to get dns server addresses in Network Byte Order, - and set statp->nscount - (for Win9x and NT <= 4.0, but not Win95 with DHCP) + and set statp->nscount (for NT <= 4.0) Read the registry SearchList ***********************************************************************/ @@ -357,12 +356,10 @@ static void get_registry_dns(res_state statp) { HKEY hKey; DWORD res; - const char *keyName[] = {"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", - "System\\CurrentControlSet\\Services\\VxD\\MSTCP"}; - int is9x = !!(GetVersion() & 0x80000000); + const char *keyName = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"; - DPRINTF(statp->options & RES_DEBUG, "key %s\n", keyName[is9x]); - if ((res = RegOpenKeyEx( HKEY_LOCAL_MACHINE, keyName[is9x], 0, + DPRINTF(statp->options & RES_DEBUG, "key %s\n", keyName); + if ((res = RegOpenKeyEx( HKEY_LOCAL_MACHINE, keyName, 0, KEY_QUERY_VALUE | KEY_READ, &hKey)) != ERROR_SUCCESS) { DPRINTF(statp->options & RES_DEBUG, "RegOpenKeyEx: error %lu (Windows)\n", res); return; @@ -370,7 +367,7 @@ static void get_registry_dns(res_state statp) if (statp->nscount == 0) get_registry_dns_items(hKey, "NameServer", statp, 0); - if (statp->nscount == 0 && !is9x) + if (statp->nscount == 0) get_registry_dns_items(hKey, "DhcpNameServer", statp, 0); if (statp->dnsrch[0] == NULL) get_registry_dns_items(hKey, "SearchList", statp, 1); |