diff options
| author | dan <Dan Kennedy> | 2024-10-02 11:11:29 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2024-10-02 11:11:29 +0000 |
| commit | 512ad53f3ac8ae97bf83021efd96f96e79750b57 (patch) | |
| tree | 0ee9e2dd9df3f092d5e0015987e296300fcfb6e7 /src/vdbeaux.c | |
| parent | f9d1141a3b34e36cf26be87dbd199b036985b2d6 (diff) | |
| parent | 7151010919cff7ab5134173f5d22fdf534104c34 (diff) | |
| download | sqlite-512ad53f3ac8ae97bf83021efd96f96e79750b57.tar.gz sqlite-512ad53f3ac8ae97bf83021efd96f96e79750b57.zip | |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 2b3945e6a597e6853cac567052e92926c8cb6d7a029ac64c2d45c321bbe2e94d
Diffstat (limited to 'src/vdbeaux.c')
| -rw-r--r-- | src/vdbeaux.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c index a66bdecff..5ff4ca928 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -4512,9 +4512,13 @@ SQLITE_NOINLINE int sqlite3BlobCompare(const Mem *pB1, const Mem *pB2){ ** We must use separate SQLITE_NOINLINE functions here, since otherwise ** optimizer code movement causes gcov to become very confused. */ -#if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_DEBUG) +#if (defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_DEBUG)) \ + && (!defined(SQLITE_USE_LONG_DOUBLE) || SQLITE_USE_LONG_DOUBLE+0==0) static int SQLITE_NOINLINE doubleLt(double a, double b){ return a<b; } static int SQLITE_NOINLINE doubleEq(double a, double b){ return a==b; } +#else +# define doubleLt(A,B) 1 +# define doubleEq(A,B) 1 #endif /* @@ -4528,7 +4532,7 @@ int sqlite3IntFloatCompare(i64 i, double r){ ** than NULL */ return 1; } - if( sqlite3Config.bUseLongDouble ){ + if( SqliteUseLongDouble ){ LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i; testcase( x<r ); testcase( x>r ); |