patches/nss-sqlite-tempfilename-ifdef.patch - Issue 12197027: Merge NSS_3_14_2_RTM.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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:

OLD	NEW
(Empty)
	1 diff --git mozilla/security/nss/lib/softoken/sdb.c mozilla/security/nss/lib/soft oken/sdb.c

	2 index 0d25953..de6cfc3 100644

	3 --- mozilla/security/nss/lib/softoken/sdb.c

	4 +++ mozilla/security/nss/lib/softoken/sdb.c

	5 @@ -257,6 +257,9 @@ sdb_getFallbackTempDir(void)

	6 static char *

	7 sdb_getTempDir(sqlite3 *sqlDB)

	8 {

	9 +#ifndef SQLITE_FCNTL_TEMPFILENAME

	10 + return sdb_getFallbackTempDir();

	11 +#else

	12 int sqlrv;

	13 char *result = NULL;

	14 char *tempName = NULL;

	15 @@ -295,6 +298,7 @@ sdb_getTempDir(sqlite3 *sqlDB)

	16

	17 sqlite3_free(tempName);

	18 return result;

	19 +#endif

	20 }

	21

	22 /*

OLD	NEW