generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 05:29:41 +01:00
Code Issues Projects Releases Wiki Activity

- fix of the Timer fix from rev. 1953

Browse Source 
- improved UTFString definitions
- allow empty Glob (testMatchEmptyPattern() failing)
- fixed SF#3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict
This commit is contained in:
Aleksandar Fabijanic
2012-08-18 21:09:50 +00:00
parent e4baf46d7b
commit 88134859e4
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Net/src/NetworkInterface.cpp
View File

@@ -41,11 +41,11 @@
#include "Poco/RefCountedObject.h"
#include "Poco/Format.h"
#if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_WIN32_UTF8)
#include "Poco/UnicodeConverter.h"
#endif
#include <iphlpapi.h>
#include <ipifcons.h>
#if defined(POCO_WIN32_UTF8)
#include "Poco/UnicodeConverter.h"
#endif
#include <iphlpapi.h>
#include <ipifcons.h>
#endif
#include <cstring>
#include <iostream>
@@ -997,7 +997,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, displayName);
#else
char displayNameBuffer[1024];
int rc = WideCharToMultiByte(CP_ACP, WC_DEFAULTCHAR, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
if (rc) displayName = displayNameBuffer;
#endif