From 125310a26af82c9cb79920c135eb73c5ccc35f4d Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Wed, 20 Aug 2014 22:19:34 -0500 Subject: [PATCH] Fix for GH #518 - Missing Error.h and int. --- Net/src/NetworkInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index 1b42aa871..7270eb5d1 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -28,8 +28,8 @@ #if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_WIN32_UTF8) #include "Poco/UnicodeConverter.h" - #include "Poco/Error.h" #endif + #include "Poco/Error.h" #include #include #endif @@ -1105,10 +1105,10 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) Poco::UnicodeConverter::toUTF8(pAddress->Description, displayName); #else char nameBuffer[1024]; - rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL); + int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, nameBuffer, sizeof(nameBuffer), NULL, NULL); if (rc) name = nameBuffer; char displayNameBuffer[1024]; - int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL); + rc = WideCharToMultiByte(CP_ACP, 0, pAddress->Description, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL); if (rc) displayName = displayNameBuffer; #endif