diff --git a/mozilla/security/nss/lib/sqlite/README b/mozilla/security/nss/lib/sqlite/README index dbb9048f5dc..f2d1c150e3c 100644 --- a/mozilla/security/nss/lib/sqlite/README +++ b/mozilla/security/nss/lib/sqlite/README @@ -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. diff --git a/mozilla/security/nss/lib/sqlite/sqlite3.c b/mozilla/security/nss/lib/sqlite/sqlite3.c index db4d74d9dd5..b1786431634 100644 --- a/mozilla/security/nss/lib/sqlite/sqlite3.c +++ b/mozilla/security/nss/lib/sqlite/sqlite3.c @@ -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