diff options
| author | dan <Dan Kennedy> | 2024-02-21 16:12:23 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2024-02-21 16:12:23 +0000 |
| commit | ebd99d5708fdc32b599faa1d8e1661fc6395e12d (patch) | |
| tree | 13eef8e0c78c6a3a608d4ba51fae04a620809f19 /src/os_unix.c | |
| parent | eb715f022f71d912e11b51ba7ab68f77d92e0234 (diff) | |
| parent | 21eda699d7154c045c72e8c848ebe2ade011165f (diff) | |
| download | sqlite-ebd99d5708fdc32b599faa1d8e1661fc6395e12d.tar.gz sqlite-ebd99d5708fdc32b599faa1d8e1661fc6395e12d.zip | |
Merge trunk changes into this branch.
FossilOrigin-Name: 63e8846ac1dc1cf1f7071c4634ccbfec3c13560db6afec376cd91515b62430d3
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 4b3d63c2c..4663c22d9 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1295,8 +1295,12 @@ static int unixLogErrorAtLine( ** available, the error message will often be an empty string. Not a ** huge problem. Incorrectly concluding that the GNU version is available ** could lead to a segfault though. + ** + ** Forum post 3f13857fa4062301 reports that the Android SDK may use + ** int-type return, depending on its version. */ -#if defined(STRERROR_R_CHAR_P) || defined(__USE_GNU) +#if (defined(STRERROR_R_CHAR_P) || defined(__USE_GNU)) \ + && !defined(ANDROID) && !defined(__ANDROID__) zErr = # endif strerror_r(iErrno, aErr, sizeof(aErr)-1); |