Merge latest trunk changes into this branch.

FossilOrigin-Name: 2b3945e6a597e6853cac567052e92926c8cb6d7a029ac64c2d45c321bbe2e94d

1 files changed, 6 insertions, 2 deletions

diff --git a/src/util.c b/src/util.c
index 0cebb474a..6725306ed 100644
--- a/src/util.c
+++ b/src/util.c
@@ -458,6 +458,7 @@ u8 sqlite3StrIHash(const char *z){
   return h;
 }
 
+#if !defined(SQLITE_USE_LONG_DOUBLE) || SQLITE_USE_LONG_DOUBLE+0==0
 /* Double-Double multiplication.  (x[0],x[1]) *= (y,yy)
 **
 ** Reference:
@@ -493,6 +494,9 @@ static void dekkerMul2(volatile double *x, double y, double yy){
   x[1] = c - x[0];
   x[1] += cc;
 }
+#else
+# define dekkerMul2(A,B,C)  /* No-op if SqliteUseLongDouble is always true */
+#endif
 
 /*
 ** The string z[] is an text representation of a real number.
@@ -652,7 +656,7 @@ do_atof_calc:
 
   if( e==0 ){
     *pResult = s;
-  }else if( sqlite3Config.bUseLongDouble ){
+  }else if( SqliteUseLongDouble ){
     LONGDOUBLE_TYPE r = (LONGDOUBLE_TYPE)s;
     if( e>0 ){
       while( e>=100  ){ e-=100; r *= 1.0e+100L; }
@@ -1063,7 +1067,7 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRound){
   /* Multiply r by powers of ten until it lands somewhere in between
   ** 1.0e+19 and 1.0e+17.
   */
-  if( sqlite3Config.bUseLongDouble ){
+  if( SqliteUseLongDouble ){
     LONGDOUBLE_TYPE rr = r;
     if( rr>=1.0e+19 ){
       while( rr>=1.0e+119L ){ exp+=100; rr *= 1.0e-100L; }