From c5e70af09a4cab3212056bbf98020705bbe4c544 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Thu, 29 Mar 2018 15:50:23 -0400
Subject: [PATCH] DataDirectories header should be shared between
 platform-specific implementations

---
 src/lib/common/DataDirectories.h       | 24 +++++++++++++++++++-----
 src/lib/common/win32/DataDirectories.h | 20 --------------------
 2 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 src/lib/common/win32/DataDirectories.h

diff --git a/src/lib/common/DataDirectories.h b/src/lib/common/DataDirectories.h
index fad4b559..f615a653 100644
--- a/src/lib/common/DataDirectories.h
+++ b/src/lib/common/DataDirectories.h
@@ -1,7 +1,21 @@
 #pragma once
 
-#ifdef _WIN32
-#include "win32/DataDirectories.h"
-#else
-#include "unix/DataDirectories.h"
-#endif
+#include <string>
+
+class DataDirectories
+{
+public:
+    static const std::string& personal();
+    static const std::string& personal(const std::string& path);
+
+    static const std::string& profile();
+    static const std::string& profile(const std::string& path);
+
+private:
+    // static class
+    DataDirectories() {}
+
+    static std::string _personal;
+    static std::string _profile;
+};
+
diff --git a/src/lib/common/win32/DataDirectories.h b/src/lib/common/win32/DataDirectories.h
deleted file mode 100644
index 3b276162..00000000
--- a/src/lib/common/win32/DataDirectories.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <string>
-
-class DataDirectories
-{
-public:
-    static const std::string& personal();
-    static const std::string& personal(const std::string& path);
-
-    static const std::string& profile();
-    static const std::string& profile(const std::string& path);
-
-private:
-    // static class
-    DataDirectories() {}
-
-    static std::string _personal;
-    static std::string _profile;
-};
\ No newline at end of file