Bug 789257 - Remove some unneeded includes on Windows; r=bbondy

toolkit/mozapps/update/updater/archivereader.cpp

@@ -15,9 +15,7 @@
 #include "updatehelper.h"
 #endif
 
-#define UPDATER_NO_STRING_GLUE_STL
 #include "../../../../xpcom/build/nsVersionComparator.cpp"
-#undef UPDATER_NO_STRING_GLUE_STL
 
 #if defined(XP_UNIX)
 # include <sys/types.h>

xpcom/glue/nsVersionComparator.cpp

@@ -3,13 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsVersionComparator.h"
+#include <algorithm>
 
-#include <stdlib.h>
-#include <string.h>
-#if defined(XP_WIN) && !defined(UPDATER_NO_STRING_GLUE_STL)
-#include <wchar.h>
-#include "nsStringGlue.h"
-#endif
 
 struct VersionPart {
   int32_t     numA;
@@ -257,7 +252,7 @@ CompareVP(VersionPartW &v1, VersionPartW &v2)
   if (r)
     return r;
 
-  r = wcsncmp(v1.strB, v2.strB, NS_MIN(v1.strBlen,v2.strBlen));
+  r = wcsncmp(v1.strB, v2.strB, std::min(v1.strBlen,v2.strBlen));
   if (r)
     return r;
 

xpcom/glue/nsVersionComparator.h

@@ -6,13 +6,9 @@
 #define nsVersionComparator_h__
 
 #include "nscore.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#if defined(XP_WIN) && !defined(UPDATER_NO_STRING_GLUE_STL)
-#include <wchar.h>
-#include "nsStringGlue.h"
-#endif
 
 /**
  * In order to compare version numbers in Mozilla, you need to use the