From c2a7ce04edbde925966f03d78cc8db077416da28 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Mon, 17 Mar 2014 21:58:40 +0000
Subject: Drop CONFIG_WIN32_NET setting

---
 win32/Kbuild  |  2 +-
 win32/uname.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'win32')

diff --git a/win32/Kbuild b/win32/Kbuild
index d82a9bfff..ca44a4134 100644
--- a/win32/Kbuild
+++ b/win32/Kbuild
@@ -10,7 +10,7 @@ lib-$(CONFIG_PLATFORM_MINGW32) += ioctl.o
 lib-$(CONFIG_PLATFORM_MINGW32) += mingw.o
 lib-$(CONFIG_PLATFORM_MINGW32) += process.o
 lib-$(CONFIG_PLATFORM_MINGW32) += regex.o
-lib-$(CONFIG_WIN32_NET) += net.o
+lib-$(CONFIG_PLATFORM_MINGW32) += net.o
 lib-$(CONFIG_PLATFORM_MINGW32) += poll.o
 lib-$(CONFIG_PLATFORM_MINGW32) += popen.o
 lib-$(CONFIG_PLATFORM_MINGW32) += statfs.o
diff --git a/win32/uname.c b/win32/uname.c
index 03e94b326..465ba1e28 100644
--- a/win32/uname.c
+++ b/win32/uname.c
@@ -7,22 +7,12 @@ int uname(struct utsname *name)
 	const char *unk = "unknown";
 	OSVERSIONINFO os_info;
 	SYSTEM_INFO sys_info;
-#if !ENABLE_WIN32_NET
-	DWORD len;
-#endif
 
 	strcpy(name->sysname, "Windows_NT");
 
-#if ENABLE_WIN32_NET
 	if ( gethostname(name->nodename, sizeof(name->nodename)) != 0 ) {
 		strcpy(name->nodename, unk);
 	}
-#else
-	len = sizeof(name->nodename) - 1;
-	if ( !GetComputerName(name->nodename, &len) ) {
-		strcpy(name->nodename, unk);
-	}
-#endif
 
 	memset(&os_info, 0, sizeof(OSVERSIONINFO));
 	os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-- 
cgit v1.2.3-55-g6feb