Bug 617071 - SQLiteMutex.h breaks debug builds with system sqlite. r+a=sdwilsh.
authorAsaf Romano <aromano@mozilla.com>
Wed, 15 Dec 2010 20:57:11 +0200
changeset 59208 efc2bc1058dff5cdfd9f664aaf0ee59e71f17e81
parent 59207 6fe13b97627f9da51ab0f77ce44e3c1af749e9e4
child 59209 08c0399c5ff32859facd5402f1ff2f52da88f73a
push id17582
push useraromano@mozilla.com
push dateWed, 15 Dec 2010 18:56:49 +0000
treeherdermozilla-central@efc2bc1058df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs617071
milestone2.0b9pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 617071 - SQLiteMutex.h breaks debug builds with system sqlite. r+a=sdwilsh.
storage/src/SQLiteMutex.h
--- a/storage/src/SQLiteMutex.h
+++ b/storage/src/SQLiteMutex.h
@@ -78,17 +78,17 @@ public:
    */
   void initWithMutex(sqlite3_mutex *aMutex)
   {
     NS_ASSERTION(aMutex, "You must pass in a valid mutex!");
     NS_ASSERTION(!mMutex, "A mutex has already been set for this!");
     mMutex = aMutex;
   }
 
-#ifndef DEBUG
+#if !defined(DEBUG) || defined(MOZ_NATIVE_SQLITE)
   /**
    * Acquires the mutex.
    */
   void lock()
   {
     sqlite3_mutex_enter(mMutex);
   }