Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 818771: Fix Solaris compilation error because its gettimeofday,

Browse Source 
when compiled with -D_SVID_GETTOD, takes only one argument. TBR=bsmith.
Modified Files:
	README sqlite3.c


git-svn-id: svn://10.0.0.236/trunk@264543 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2012-12-11 04:27:14 +00:00
parent c81cf1ea51
commit 40d9a16725
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/security/nss/lib/sqlite/README
View File

@ -1,3 +1,6 @@
This is SQLite 3.7.14.1.
Local changes:
1. Allow System V one-argument version of gettimeofday when compiled with
-D_SVID_GETTOD on Solaris. See CVS revision 1.8.

6
mozilla/security/nss/lib/sqlite/sqlite3.c
View File

@ -28318,7 +28318,11 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){
*piNow = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_nsec/1000000;
#else
struct timeval sNow;
#ifdef _SVID_GETTOD
if( gettimeofday(&sNow)==0 ){
#else
if( gettimeofday(&sNow, 0)==0 ){
#endif
*piNow = unixEpoch + 1000*(sqlite3_int64)sNow.tv_sec + sNow.tv_usec/1000;
}else{
rc = SQLITE_ERROR;
@ -135578,7 +135582,7 @@ SQLITE_API int sqlite3_extension_init(
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: sqlite3.c,v 1.7 2012-12-11 02:24:10 wtc%google.com Exp $
** $Id: sqlite3.c,v 1.8 2012-12-11 04:27:14 wtc%google.com Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library