From 34ce06ac17aeb592b85ec3669951c48c69725110 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 12 Nov 2019 14:19:14 -0500
Subject: [PATCH] some cleanup

---
 libi2pd/util.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/libi2pd/util.cpp b/libi2pd/util.cpp
index ebf977e2..8f870ec4 100644
--- a/libi2pd/util.cpp
+++ b/libi2pd/util.cpp
@@ -61,11 +61,11 @@ namespace net
 {
 #ifdef WIN32
 	bool IsWindowsXPorLater()
-	{
-	    static bool isRequested = false;
-	    static bool isXP = false;
-	    if (!isRequested)
-	    {
+	{
+	    static bool isRequested = false;
+	    static bool isXP = false;
+	    if (!isRequested)
+	    {
 	        // request
             OSVERSIONINFO osvi;
 
@@ -73,8 +73,8 @@ namespace net
             osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
             GetVersionEx(&osvi);
 
-            isXP = osvi.dwMajorVersion <= 5;
-            isRequested = true;
+            isXP = osvi.dwMajorVersion <= 5;
+            isRequested = true;
         }
         return isXP;
 	}
@@ -208,24 +208,21 @@ namespace net
 #endif
 
 		bool isXP = IsWindowsXPorLater();
-		{
-			#define inet_pton inet_pton_xp
-		}
 
 		if(localAddress.is_v4())
 		{
 			sockaddr_in inputAddress;
-			if (isXP)
-                inet_pton_xp(AF_INET, localAddressUniversal.c_str(), &(inputAddress.sin_addr));
-            else
+			if (isXP)
+                inet_pton_xp(AF_INET, localAddressUniversal.c_str(), &(inputAddress.sin_addr));
+            else
                 inet_pton(AF_INET, localAddressUniversal.c_str(), &(inputAddress.sin_addr));
 			return GetMTUWindowsIpv4(inputAddress, fallback);
 		}
 		else if(localAddress.is_v6())
 		{
-			sockaddr_in6 inputAddress;
-			if (isXP)
-                 inet_pton_xp(AF_INET6, localAddressUniversal.c_str(), &(inputAddress.sin6_addr));
+			sockaddr_in6 inputAddress;
+			if (isXP)
+                 inet_pton_xp(AF_INET6, localAddressUniversal.c_str(), &(inputAddress.sin6_addr));
             else
                 inet_pton(AF_INET6, localAddressUniversal.c_str(), &(inputAddress.sin6_addr));
 			return GetMTUWindowsIpv6(inputAddress, fallback);