From 46bee41b429e4e25a0beba063d391c4599e329ce Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Fri, 8 Jan 2010 05:42:38 +0000 Subject: [PATCH] Bug 494603: Fix Solaris compilation error because its gettimeofday, when compiled with -D_SVID_GETTOD, takes only one argument. Rev. 1.4 of this file has this change, but I don't know if this is our local change or it comes from sqlite upstream. git-svn-id: svn://10.0.0.236/trunk@259364 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/sqlite/sqlite3.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/lib/sqlite/sqlite3.c b/mozilla/security/nss/lib/sqlite/sqlite3.c index d7fafb7915f..db53a8b813b 100644 --- a/mozilla/security/nss/lib/sqlite/sqlite3.c +++ b/mozilla/security/nss/lib/sqlite/sqlite3.c @@ -25804,7 +25804,11 @@ static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){ *prNow = 2440587.5 + sNow.tv_sec/86400.0 + sNow.tv_nsec/86400000000000.0; #else struct timeval sNow; +#ifdef _SVID_GETTOD + gettimeofday(&sNow); +#else gettimeofday(&sNow, 0); +#endif *prNow = 2440587.5 + sNow.tv_sec/86400.0 + sNow.tv_usec/86400000000.0; #endif @@ -110113,7 +110117,7 @@ SQLITE_API int sqlite3_extension_init( ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: sqlite3.c,v 1.5 2010-01-08 01:40:39 wtc%google.com Exp $ +** $Id: sqlite3.c,v 1.6 2010-01-08 05:42:38 wtc%google.com Exp $ ** ** This file implements an integration between the ICU library ** ("International Components for Unicode", an open-source library @@ -110614,7 +110618,7 @@ SQLITE_API int sqlite3_extension_init( ************************************************************************* ** This file implements a tokenizer for fts3 based on the ICU library. ** -** $Id: sqlite3.c,v 1.5 2010-01-08 01:40:39 wtc%google.com Exp $ +** $Id: sqlite3.c,v 1.6 2010-01-08 05:42:38 wtc%google.com Exp $ */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)