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

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
« no previous file with comments | « 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,20 @@
+Index: mozilla/security/nss/lib/softoken/sdb.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- mozilla/security/nss/lib/softoken/sdb.c 16 Jan 2013 18:13:25 -0000 1.30
++++ mozilla/security/nss/lib/softoken/sdb.c 4 Feb 2013 19:58:20 -0000 1.31
+@@ -254,6 +254,11 @@
+ #error "sdb_getFallbackTempDir not implemented"
+ #endif
+
++#ifndef SQLITE_FCNTL_TEMPFILENAME
++/* SQLITE_FCNTL_TEMPFILENAME was added in SQLite 3.7.15 */
++#define SQLITE_FCNTL_TEMPFILENAME 16
++#endif
++
+ static char *
+ sdb_getTempDir(sqlite3 *sqlDB)
+ {
« no previous file with comments | « 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