diff options
author | Ron Yorston <rmy@pobox.com> | 2014-03-17 21:58:40 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-03-17 21:58:40 +0000 |
commit | c2a7ce04edbde925966f03d78cc8db077416da28 (patch) | |
tree | c55b561c25ab8c21d082c0edb6edf45b131ea169 /win32 | |
parent | 8d989e6c6af206f56e8ea596197dd724454097f0 (diff) | |
download | busybox-w32-c2a7ce04edbde925966f03d78cc8db077416da28.tar.gz busybox-w32-c2a7ce04edbde925966f03d78cc8db077416da28.tar.bz2 busybox-w32-c2a7ce04edbde925966f03d78cc8db077416da28.zip |
Drop CONFIG_WIN32_NET setting
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Kbuild | 2 | ||||
-rw-r--r-- | win32/uname.c | 10 |
2 files changed, 1 insertions, 11 deletions
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 | |||
10 | lib-$(CONFIG_PLATFORM_MINGW32) += mingw.o | 10 | lib-$(CONFIG_PLATFORM_MINGW32) += mingw.o |
11 | lib-$(CONFIG_PLATFORM_MINGW32) += process.o | 11 | lib-$(CONFIG_PLATFORM_MINGW32) += process.o |
12 | lib-$(CONFIG_PLATFORM_MINGW32) += regex.o | 12 | lib-$(CONFIG_PLATFORM_MINGW32) += regex.o |
13 | lib-$(CONFIG_WIN32_NET) += net.o | 13 | lib-$(CONFIG_PLATFORM_MINGW32) += net.o |
14 | lib-$(CONFIG_PLATFORM_MINGW32) += poll.o | 14 | lib-$(CONFIG_PLATFORM_MINGW32) += poll.o |
15 | lib-$(CONFIG_PLATFORM_MINGW32) += popen.o | 15 | lib-$(CONFIG_PLATFORM_MINGW32) += popen.o |
16 | lib-$(CONFIG_PLATFORM_MINGW32) += statfs.o | 16 | 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) | |||
7 | const char *unk = "unknown"; | 7 | const char *unk = "unknown"; |
8 | OSVERSIONINFO os_info; | 8 | OSVERSIONINFO os_info; |
9 | SYSTEM_INFO sys_info; | 9 | SYSTEM_INFO sys_info; |
10 | #if !ENABLE_WIN32_NET | ||
11 | DWORD len; | ||
12 | #endif | ||
13 | 10 | ||
14 | strcpy(name->sysname, "Windows_NT"); | 11 | strcpy(name->sysname, "Windows_NT"); |
15 | 12 | ||
16 | #if ENABLE_WIN32_NET | ||
17 | if ( gethostname(name->nodename, sizeof(name->nodename)) != 0 ) { | 13 | if ( gethostname(name->nodename, sizeof(name->nodename)) != 0 ) { |
18 | strcpy(name->nodename, unk); | 14 | strcpy(name->nodename, unk); |
19 | } | 15 | } |
20 | #else | ||
21 | len = sizeof(name->nodename) - 1; | ||
22 | if ( !GetComputerName(name->nodename, &len) ) { | ||
23 | strcpy(name->nodename, unk); | ||
24 | } | ||
25 | #endif | ||
26 | 16 | ||
27 | memset(&os_info, 0, sizeof(OSVERSIONINFO)); | 17 | memset(&os_info, 0, sizeof(OSVERSIONINFO)); |
28 | os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); | 18 | os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); |