Merge pull request #2097 from Diapolo/fix_merges

fix small stuff related to the recent merge-wave

bitcoin-qt.pro

@@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \
     src/netbase.h \
     src/clientversion.h \
     src/txdb.h \
-    src/leveldb.h
+    src/leveldb.h \
+    src/threadsafety.h
 
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \

src/leveldb/build_detect_platform

@@ -119,15 +119,15 @@ case "$TARGET_OS" in
         PLATFORM_EXTRALIBS="-lboost_system-mt-s -lboost_filesystem-mt-s -lboost_thread_win32-mt-s"
         CROSS_COMPILE=true
         ;;
-  NATIVE_WINDOWS)
+    NATIVE_WINDOWS)
         PLATFORM=OS_WINDOWS
         COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_WINDOWS -DLEVELDB_PLATFORM_WINDOWS -DBOOST_THREAD_USE_LIB"
         PLATFORM_CXXFLAGS=""
         PLATFORM_LDFLAGS=""
         PLATFORM_SHARED_CFLAGS=""
         PLATFORM_SOURCES="port/port_win.cc util/env_boost.cc util/win_logger.cc"
-		PLATFORM_EXTRALIBS="-lboost_system-mgw45-mt-s-1_50 -lboost_filesystem-mgw45-mt-s-1_50 -lboost_thread-mgw45-mt-s-1_50 -lboost_chrono-mgw45-mt-s-1_50"
+        PLATFORM_EXTRALIBS="-lboost_system-mgw45-mt-s-1_50 -lboost_filesystem-mgw45-mt-s-1_50 -lboost_thread-mgw45-mt-s-1_50 -lboost_chrono-mgw45-mt-s-1_50"
-        CROSS_COMPILE=true	
+        CROSS_COMPILE=true
 	    ;;
     *)
         echo "Unknown platform!" >&2