Bug 1263622 - Fixed nsNSSComponent.cpp compilation on mingw. r=dkeeler,ted
authorJacek Caban <jacek@codeweavers.com>
Sat, 23 Apr 2016 10:55:50 +0200
changeset 332499 482df01e83b54fdcc4b4dbdc9761e0c884b77802
parent 332498 3a1cffbeb01b4dcf3a6694d3f985a46203abfbf8
child 332500 a13c98a579250bce726f25bcbffc37e35bd0379e
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdkeeler, ted
bugs1263622
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1263622 - Fixed nsNSSComponent.cpp compilation on mingw. r=dkeeler,ted
security/manager/ssl/nsNSSComponent.cpp
toolkit/library/moz.build
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -53,19 +53,19 @@
 #include "nsSmartCardMonitor.h"
 #endif
 
 #ifdef XP_WIN
 #include "mozilla/WindowsVersion.h"
 #include "nsILocalFileWin.h"
 
 #include "windows.h" // this needs to be before the following includes
-#include "Lmcons.h"
-#include "Sddl.h"
-#include "Wincrypt.h"
+#include "lmcons.h"
+#include "sddl.h"
+#include "wincrypt.h"
 #include "nsIWindowsRegKey.h"
 #endif
 
 using namespace mozilla;
 using namespace mozilla::psm;
 
 LazyLogModule gPIPNSSLog("pipnss");
 
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -139,17 +139,16 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CXXFLAGS += CONFIG['TK_CFLAGS']
 
 if CONFIG['MOZ_WEBRTC']:
     if CONFIG['OS_TARGET'] == 'WINNT':
         OS_LIBS += [
             'secur32',
-            'crypt32',
             'iphlpapi',
             'strmiids',
             'dmoguids',
             'wmcodecdspuuid',
             'amstrmid',
             'msdmo',
             'wininet',
         ]
@@ -183,16 +182,17 @@ if CONFIG['MOZ_DIRECTSHOW']:
 
 if CONFIG['OS_ARCH'] == 'FreeBSD':
     OS_LIBS += [
         'util',
     ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
+        'crypt32',
         'shell32',
         'ole32',
         'version',
         'winspool',
     ]
 
 if CONFIG['MOZ_B2G_BT_BLUEZ'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     OS_LIBS += [