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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patches/nss-sqlite-tempfilename-ifdef.patch

Issue 12197027: Merge NSS_3_14_2_RTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 10 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
« README.chromium ('K') | « mozilla/security/nss/lib/util/secoidt.h ('k') | scripts/nss-checkout.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/nss-sqlite-tempfilename-ifdef.patch
===================================================================
--- patches/nss-sqlite-tempfilename-ifdef.patch (revision 0)
+++ patches/nss-sqlite-tempfilename-ifdef.patch (revision 0)
@@ -0,0 +1,22 @@
+diff --git mozilla/security/nss/lib/softoken/sdb.c mozilla/security/nss/lib/softoken/sdb.c
+index 0d25953..de6cfc3 100644
+--- mozilla/security/nss/lib/softoken/sdb.c
++++ mozilla/security/nss/lib/softoken/sdb.c
+@@ -257,6 +257,9 @@ sdb_getFallbackTempDir(void)
+ static char *
+ sdb_getTempDir(sqlite3 *sqlDB)
+ {
++#ifndef SQLITE_FCNTL_TEMPFILENAME
++ return sdb_getFallbackTempDir();
++#else
+ int sqlrv;
+ char *result = NULL;
+ char *tempName = NULL;
+@@ -295,6 +298,7 @@ sdb_getTempDir(sqlite3 *sqlDB)
+
+ sqlite3_free(tempName);
+ return result;
++#endif
+ }
+
+ /*
« README.chromium ('K') | « mozilla/security/nss/lib/util/secoidt.h ('k') | scripts/nss-checkout.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698