No issue - Clean up some obsolete/archaic code paths.

3 files changed, 1 insertions, 13 deletions

diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp
index 58f4345ef8..3216a24909 100644
--- a/netwerk/system/win32/nsNotifyAddrListener.cpp
+++ b/netwerk/system/win32/nsNotifyAddrListener.cpp
@@ -1,13 +1,8 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:set et sw=4 ts=4: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// We define this to make our use of inet_ntoa() pass. The "proper" function
-// inet_ntop() doesn't exist on Windows XP.
-#define _WINSOCK_DEPRECATED_NO_WARNINGS
-
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
diff --git a/netwerk/wifi/win_wifiScanner.cpp b/netwerk/wifi/win_wifiScanner.cpp
index a462b96969..2d88b6f83f 100644
--- a/netwerk/wifi/win_wifiScanner.cpp
+++ b/netwerk/wifi/win_wifiScanner.cpp
@@ -70,10 +70,6 @@ WinWifiScanner::WinWifiScanner()
 {
   // NOTE: We assume that, if we were unable to load the WLAN library when
   // we initially tried, we will not be able to load it in the future.
-  // Technically, on Windows XP SP2, a user could install the redistributable
-  // and make our assumption incorrect. We opt to avoid making a bunch of
-  // spurious LoadLibrary calls in the common case rather than load the
-  // WLAN API in the edge case.
   mWlanLibrary = WinWLANLibrary::Load();
   if (!mWlanLibrary) {
     NS_WARNING("Could not initialize Windows Wi-Fi scanner");
diff --git a/netwerk/wifi/win_wlanLibrary.cpp b/netwerk/wifi/win_wlanLibrary.cpp
index cf1052788a..1ccb8e0e1f 100644
--- a/netwerk/wifi/win_wlanLibrary.cpp
+++ b/netwerk/wifi/win_wlanLibrary.cpp
@@ -127,10 +127,7 @@ WinWLANLibrary::Initialize()
 
   // Get the handle to the WLAN API.
   DWORD negotiated_version;
-  // We could be executing on either Windows XP or Windows Vista, so use the
-  // lower version of the client WLAN API. It seems that the negotiated version
-  // is the Vista version irrespective of what we pass!
-  static const int kXpWlanClientVersion = 1;
+  static const int kXpWlanClientVersion = 2;
   if (ERROR_SUCCESS !=
       (*mWlanOpenHandlePtr)(kXpWlanClientVersion,
                             nullptr,