diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
| commit | fb383e9229461dd883852418b6489c091cdce3cd (patch) | |
| tree | e4ff7f3e1f80bbdaf23ead55a502796f58881aaa /src/main.c | |
| parent | 00eb70d89c427a6d0e86788346c8ddd6f93d6ec5 (diff) | |
| parent | 22ecef5c20e007ae5121d9febb3bb3d7f56097b0 (diff) | |
| download | sqlite-fb383e9229461dd883852418b6489c091cdce3cd.tar.gz sqlite-fb383e9229461dd883852418b6489c091cdce3cd.zip | |
Merge updates from trunk. Make OSTRACE changes work on Linux.
FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index a2177fd79..043f3e14d 100644 --- a/src/main.c +++ b/src/main.c @@ -60,8 +60,7 @@ int sqlite3_threadsafe(void){ return SQLITE_THREADSAFE; } ** this variable being set to non-zero will cause OSTRACE macros to emit ** extra diagnostic information. */ -#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) +#ifdef SQLITE_HAVE_OS_TRACE # ifndef SQLITE_DEBUG_OS_TRACE # define SQLITE_DEBUG_OS_TRACE 0 # endif @@ -1207,8 +1206,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){ ** Return a static string containing the name corresponding to the error code ** specified in the argument. */ -#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) +#ifdef SQLITE_HAVE_OS_TRACE const char *sqlite3ErrName(int rc){ const char *zName = 0; int i, origRc = rc; |