CMake

include/siadrive_api/eventsystem.h

@@ -36,7 +36,9 @@ public:
 	CEventSystem& operator=(const CEventSystem&) = delete;
 
 private:
+#ifdef _WIN32
 	HANDLE _stopEvent;
+#endif
 	std::deque<CEventPtr> _eventQueue;
 	std::deque<std::function<void(const CEvent&)>> _eventConsumers;
 	std::mutex _eventMutex;

include/siadrive_api/siacommon.h

@@ -71,11 +71,6 @@ public:
 		std::exception(SString::ToUtf8(reason).c_str())
 	{
 	}
-
-	StartupException(const std::string& reason) :
-		std::exception(reason.c_str())
-	{
-	}
 };
 
 #define DEFAULT_CONFIG_FILE_PATH L"./config/siadriveconfig.json"

include/siadrive_api/uploadmanager.h

@@ -3,8 +3,10 @@
 
 #include <autothread.h>
 #include <SQLiteCpp/Database.h>
+#include <SQLiteCpp/Exception.h>
 #include <deque>
-#include <EventSystem.h>
+#include <siacurl.h>
+#include <eventsystem.h>
 
 NS_BEGIN(Sia)
 NS_BEGIN(Api)
@@ -845,7 +847,7 @@ public:
 	}
 };
 
-class DatabaseExceptionOccurred :
+class SIADRIVE_EXPORTABLE DatabaseExceptionOccurred :
 	public CEvent
 {
 public:
@@ -871,7 +873,7 @@ public:
 
 	virtual SString GetSingleLineMessage() const override
 	{
-		return L"DatabaseExceptionOccurred|MSG|" + SString(CA2W(_exception.getErrorStr()).m_psz);
+		return L"DatabaseExceptionOccurred|MSG|" + SString(_exception.getErrorStr());
 	}
 };