diff options
author | drh <drh@noemail.net> | 2011-10-15 00:16:30 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2011-10-15 00:16:30 +0000 |
commit | 30ddce6ff427a2757cfca3ba1204a16937a6e293 (patch) | |
tree | a8d9af6dcf4049994c02b390b0f5e8ad2b56272c /src/main.c | |
parent | 086e4913b5e0a959c50ee9ab135a22b7a23f479f (diff) | |
download | sqlite-30ddce6ff427a2757cfca3ba1204a16937a6e293.tar.gz sqlite-30ddce6ff427a2757cfca3ba1204a16937a6e293.zip |
Added the tool/warnings-clang.sh script. Changes so that there are no
warnings with either gcc or clang even including FTS4 and RTREE and
both with and without SQLITE_THREADSAFE=0.
FossilOrigin-Name: 39408702a989f907261c298bf0947f3e68bd10fe
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index b18217d34..42bbba5d0 100644 --- a/src/main.c +++ b/src/main.c @@ -106,7 +106,7 @@ char *sqlite3_temp_directory = 0; ** without blocking. */ int sqlite3_initialize(void){ - sqlite3_mutex *pMaster; /* The main static mutex */ + MUTEX_LOGIC( sqlite3_mutex *pMaster; ) /* The main static mutex */ int rc; /* Result code */ #ifdef SQLITE_OMIT_WSD @@ -140,7 +140,7 @@ int sqlite3_initialize(void){ ** malloc subsystem - this implies that the allocation of a static ** mutex must not require support from the malloc subsystem. */ - pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); + MUTEX_LOGIC( pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); ) sqlite3_mutex_enter(pMaster); sqlite3GlobalConfig.isMutexInit = 1; if( !sqlite3GlobalConfig.isMallocInit ){ |