Index: third_party/sqlite/src/src/mutex.h |
diff --git a/third_party/sqlite/src/src/mutex.h b/third_party/sqlite/src/src/mutex.h |
index c24f3da4c622c1904cc74e25babb3e524283a844..03eb1faadb67a7f3b00c79f56349872965b2db74 100644 |
--- a/third_party/sqlite/src/src/mutex.h |
+++ b/third_party/sqlite/src/src/mutex.h |
@@ -25,7 +25,7 @@ |
** Figure out what version of the code to use. The choices are |
** |
** SQLITE_MUTEX_OMIT No mutex logic. Not even stubs. The |
-** mutexes implemention cannot be overridden |
+** mutexes implementation cannot be overridden |
** at start-time. |
** |
** SQLITE_MUTEX_NOOP For single-threaded applications. No |
@@ -36,8 +36,6 @@ |
** SQLITE_MUTEX_PTHREADS For multi-threaded applications on Unix. |
** |
** SQLITE_MUTEX_W32 For multi-threaded applications on Win32. |
-** |
-** SQLITE_MUTEX_OS2 For multi-threaded applications on OS/2. |
*/ |
#if !SQLITE_THREADSAFE |
# define SQLITE_MUTEX_OMIT |
@@ -47,8 +45,6 @@ |
# define SQLITE_MUTEX_PTHREADS |
# elif SQLITE_OS_WIN |
# define SQLITE_MUTEX_W32 |
-# elif SQLITE_OS_OS2 |
-# define SQLITE_MUTEX_OS2 |
# else |
# define SQLITE_MUTEX_NOOP |
# endif |
@@ -60,12 +56,15 @@ |
*/ |
#define sqlite3_mutex_alloc(X) ((sqlite3_mutex*)8) |
#define sqlite3_mutex_free(X) |
-#define sqlite3_mutex_enter(X) |
+#define sqlite3_mutex_enter(X) |
#define sqlite3_mutex_try(X) SQLITE_OK |
-#define sqlite3_mutex_leave(X) |
+#define sqlite3_mutex_leave(X) |
#define sqlite3_mutex_held(X) ((void)(X),1) |
#define sqlite3_mutex_notheld(X) ((void)(X),1) |
#define sqlite3MutexAlloc(X) ((sqlite3_mutex*)8) |
#define sqlite3MutexInit() SQLITE_OK |
#define sqlite3MutexEnd() |
+#define MUTEX_LOGIC(X) |
+#else |
+#define MUTEX_LOGIC(X) X |
#endif /* defined(SQLITE_MUTEX_OMIT) */ |