Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: nss.gyp

Issue 11827039: Make all nss targets build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss.gyp
===================================================================
--- nss.gyp (revision 174690)
+++ nss.gyp (working copy)
@@ -1032,7 +1032,7 @@
'mozilla/security/nss/lib/util',
],
},
- 'msvs_disabled_warnings': [4018, 4101],
+ 'msvs_disabled_warnings': [4018, 4101, 4267, ],
'conditions': [
['exclude_nss_root_certs==1', {
'defines': [
@@ -1123,6 +1123,18 @@
'MP_NO_MP_WORD',
],
}],
+ ['target_arch=="x64"', {
+ 'defines': [
+ 'NSS_USE_64',
+ 'NSS_X86_OR_X64',
+ 'NSS_X64',
+ 'WIN64',
+ ],
+ 'sources!': [
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c',
+ ],
+ }],
],
}],
['clang==1', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698