fix

2023-12-10 20:04:49 -06:00 · 2023-12-10 20:04:49 -06:00 · 932ea6cb1d
commit 932ea6cb1d
parent dd4724e374
6 changed files with 232 additions and 234 deletions
--- a/include/common.hpp
+++ b/include/common.hpp
@ -150,11 +150,28 @@ template <typename data_type>
 #define CPPHTTPLIB_OPENSSL_SUPPORT
 #include <httplib.h>

-using json = nlohmann::json;
+REPERTORY_IGNORE_WARNINGS_DISABLE()

 using namespace std::chrono_literals;
+using json = nlohmann::json;

-REPERTORY_IGNORE_WARNINGS_DISABLE()
+#define REPERTORY "repertory"
+#define REPERTORY_CONFIG_VERSION 0ull
+#define REPERTORY_DATA_NAME "repertory2"
+#define REPERTORY_MIN_REMOTE_VERSION "2.0.0"
+#define REPERTORY_W L"repertory"
+
+#ifdef _WIN32
+#define REPERTORY_INVALID_HANDLE INVALID_HANDLE_VALUE
+#define REPERTORY_API_INVALID_HANDLE static_cast<std::uint64_t>(-1)
+using native_handle = HANDLE;
+#else
+#define REPERTORY_INVALID_HANDLE (-1)
+#define REPERTORY_API_INVALID_HANDLE REPERTORY_INVALID_HANDLE
+using native_handle = int;
+#endif
+
+constexpr const auto NANOS_PER_SECOND = 1000000000L;

 #ifdef _WIN32
 #ifdef CreateDirectory
@ -198,6 +215,194 @@ REPERTORY_IGNORE_WARNINGS_DISABLE()
 #define ENETDOWN 100
 #endif

+#ifndef SETATTR_WANTS_MODE
+#define SETATTR_WANTS_MODE(attr) ((attr)->valid & (1 << 0))
+#endif // SETATTR_WANTS_MODE
+
+#ifndef SETATTR_WANTS_UID
+#define SETATTR_WANTS_UID(attr) ((attr)->valid & (1 << 1))
+#endif // SETATTR_WANTS_UID
+
+#ifndef SETATTR_WANTS_GID
+#define SETATTR_WANTS_GID(attr) ((attr)->valid & (1 << 2))
+#endif // SETATTR_WANTS_GID
+
+#ifndef SETATTR_WANTS_SIZE
+#define SETATTR_WANTS_SIZE(attr) ((attr)->valid & (1 << 3))
+#endif // SETATTR_WANTS_SIZE
+
+#ifndef SETATTR_WANTS_ACCTIME
+#define SETATTR_WANTS_ACCTIME(attr) ((attr)->valid & (1 << 4))
+#endif // SETATTR_WANTS_ACCTIME
+
+#ifndef SETATTR_WANTS_MODTIME
+#define SETATTR_WANTS_MODTIME(attr) ((attr)->valid & (1 << 5))
+#endif // SETATTR_WANTS_MODTIME
+
+#ifndef SETATTR_WANTS_CRTIME
+#define SETATTR_WANTS_CRTIME(attr) ((attr)->valid & (1 << 28))
+#endif // SETATTR_WANTS_CRTIME
+
+#ifndef SETATTR_WANTS_CHGTIME
+#define SETATTR_WANTS_CHGTIME(attr) ((attr)->valid & (1 << 29))
+#endif // SETATTR_WANTS_CHGTIME
+
+#ifndef SETATTR_WANTS_BKUPTIME
+#define SETATTR_WANTS_BKUPTIME(attr) ((attr)->valid & (1 << 30))
+#endif // SETATTR_WANTS_BKUPTIME
+
+#ifndef SETATTR_WANTS_FLAGS
+#define SETATTR_WANTS_FLAGS(attr) ((attr)->valid & (1 << 31))
+#endif // SETATTR_WANTS_FLAGS
+
+#ifndef _WIN32
+#ifdef __APPLE__
+#define G_PREFIX "org"
+#define G_KAUTH_FILESEC_XATTR G_PREFIX ".apple.system.Security"
+#define A_PREFIX "com"
+#define A_KAUTH_FILESEC_XATTR A_PREFIX ".apple.system.Security"
+#define XATTR_APPLE_PREFIX "com.apple."
+#endif
+
+#ifndef XATTR_NAME_MAX
+#define XATTR_NAME_MAX 255 /* # chars in an extended attribute name */
+#endif
+
+#ifndef XATTR_SIZE_MAX
+#define XATTR_SIZE_MAX 65536
+#endif
+#endif
+
+#ifndef fstat64
+#define fstat64 fstat
+#endif
+
+#ifndef pread64
+#define pread64 pread
+#endif
+
+#ifndef pwrite64
+#define pwrite64 pwrite
+#endif
+
+#ifndef stat64
+#define stat64 stat
+#endif
+
+#ifndef statfs64
+#define statfs64 statfs
+#endif
+
+#define WINFSP_ALLOCATION_UNIT UINT64(4096U)
+
+#ifdef _WIN32
+#define UTIME_NOW ((1l << 30) - 1l)
+#define UTIME_OMIT ((1l << 30) - 2l)
+#define CONVERT_STATUS_NOT_IMPLEMENTED(e) e
+#else
+using BOOLEAN = std::uint8_t;
+using DWORD = std::uint32_t;
+using HANDLE = void *;
+using PUINT32 = std::uint32_t *;
+using PVOID = void *;
+using PWSTR = wchar_t *;
+using SIZE_T = std::uint64_t;
+using UINT16 = std::uint16_t;
+using UINT32 = std::uint32_t;
+using UINT64 = std::uint64_t;
+using VOID = void;
+using WCHAR = wchar_t;
+
+#define FILE_ATTRIBUTE_READONLY 0x00000001
+#define FILE_ATTRIBUTE_HIDDEN 0x00000002
+#define FILE_ATTRIBUTE_SYSTEM 0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE 0x00000020
+#define FILE_ATTRIBUTE_DEVICE 0x00000040
+#define FILE_ATTRIBUTE_NORMAL 0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY 0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED 0x00000800
+#define FILE_ATTRIBUTE_OFFLINE 0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000
+#define FILE_ATTRIBUTE_INTEGRITY_STREAM 0x00008000
+#define FILE_ATTRIBUTE_VIRTUAL 0x00010000
+#define FILE_ATTRIBUTE_NO_SCRUB_DATA 0x00020000
+#define FILE_ATTRIBUTE_EA 0x00040000
+#define FILE_ATTRIBUTE_PINNED 0x00080000
+#define FILE_ATTRIBUTE_UNPINNED 0x00100000
+#define FILE_ATTRIBUTE_RECALL_ON_OPEN 0x00040000
+#define FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS 0x00400000
+
+#define FILE_DIRECTORY_FILE 0x00000001
+
+#define FILE_EXECUTE (0x0020)
+#define FILE_GENERIC_EXECUTE (0x00020000L | 0x0080 | 0x0020 | 0x00100000L)
+
+#define GENERIC_READ (0x80000000L)
+#define GENERIC_WRITE (0x40000000L)
+#define GENERIC_EXECUTE (0x20000000L)
+#define GENERIC_ALL (0x10000000L)
+
+#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+
+#define MAX_PATH 260
+
+#define STATUS_SUCCESS std::int32_t(0)
+#define STATUS_ACCESS_DENIED std::int32_t(0xC0000022L)
+#define STATUS_DEVICE_BUSY std::int32_t(0x80000011L)
+#define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::int32_t(0xC0000468L)
+#define STATUS_DIRECTORY_NOT_EMPTY std::int32_t(0xC0000101L)
+#define STATUS_FILE_IS_A_DIRECTORY std::int32_t(0xC00000BAL)
+#define STATUS_FILE_TOO_LARGE std::int32_t(0xC0000904L)
+#define STATUS_INSUFFICIENT_RESOURCES std::int32_t(0xC000009AL)
+#define STATUS_INTERNAL_ERROR std::int32_t(0xC00000E5L)
+#define STATUS_INVALID_ADDRESS std::int32_t(0xC0000141L)
+#define STATUS_INVALID_HANDLE std::int32_t(0xC0000006L)
+#define STATUS_INVALID_IMAGE_FORMAT std::int32_t(0xC000007BL)
+#define STATUS_INVALID_PARAMETER std::int32_t(0xC000000DL)
+#define STATUS_NO_MEMORY std::int32_t(0xC0000017L)
+#define STATUS_NOT_IMPLEMENTED std::int32_t(0xC0000002L)
+#define STATUS_OBJECT_NAME_EXISTS std::int32_t(0x40000000L)
+#define STATUS_OBJECT_NAME_NOT_FOUND std::int32_t(0xC0000034L)
+#define STATUS_OBJECT_PATH_INVALID std::int32_t(0xC0000039L)
+#define STATUS_UNEXPECTED_IO_ERROR std::int32_t(0xC00000E9L)
+
+#define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \
+  ((std::int32_t(e) == STATUS_NOT_IMPLEMENTED) ? -ENOTSUP : e)
+
+namespace Fsp::FileSystemBase {
+enum {
+  FspCleanupDelete = 0x01,
+  FspCleanupSetAllocationSize = 0x02,
+  FspCleanupSetArchiveBit = 0x10,
+  FspCleanupSetLastAccessTime = 0x20,
+  FspCleanupSetLastWriteTime = 0x40,
+  FspCleanupSetChangeTime = 0x80
+};
+
+struct FSP_FSCTL_FILE_INFO {
+  UINT32 FileAttributes{};
+  UINT32 ReparseTag{};
+  UINT64 AllocationSize{};
+  UINT64 FileSize{};
+  UINT64 CreationTime{};
+  UINT64 LastAccessTime{};
+  UINT64 LastWriteTime{};
+  UINT64 ChangeTime{};
+  UINT64 IndexNumber{};
+  UINT32 HardLinks{};
+  UINT32 EaSize{};
+};
+
+using FileInfo = FSP_FSCTL_FILE_INFO;
+} // namespace Fsp::FileSystemBase
+#endif
+
+using namespace Fsp;
+
 namespace repertory {
 auto get_repertory_git_revision() -> const std::string &;
 auto get_repertory_version() -> const std::string &;
@ -205,6 +410,25 @@ void repertory_init();
 void repertory_shutdown();
 } // namespace repertory

-#endif // __cplusplus
+namespace {
+template <class... Ts> struct overloaded : Ts... {
+  using Ts::operator()...;
+};
+template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
+} // namespace

+#define INTERFACE_SETUP(name)                                                  \
+public:                                                                        \
+  name(const name &) noexcept = delete;                                        \
+  name &operator=(const name &) noexcept = delete;                             \
+  name &operator=(name &&) noexcept = delete;                                  \
+                                                                               \
+protected:                                                                     \
+  name() = default;                                                            \
+  name(name &&) noexcept = default;                                            \
+                                                                               \
+public:                                                                        \
+  virtual ~name() = default
+
+#endif // __cplusplus
 #endif // INCLUDE_COMMON_HPP_
--- a/include/drives/fuse/i_fuse_drive.hpp
+++ b/include/drives/fuse/i_fuse_drive.hpp
@ -23,7 +23,6 @@
 #define INCLUDE_DRIVES_FUSE_I_FUSE_DRIVE_HPP_
 #ifndef _WIN32

-#include "platform/platform.hpp"
 #include "types/repertory.hpp"

 namespace repertory {
--- a/include/platform/platform.hpp
+++ b/include/platform/platform.hpp
@ -22,196 +22,6 @@
 #ifndef INCLUDE_PLATFORM_PLATFORM_HPP_
 #define INCLUDE_PLATFORM_PLATFORM_HPP_

-#define WINFSP_ALLOCATION_UNIT UINT64(4096U)
-
-constexpr const auto NANOS_PER_SECOND = 1000000000L;
-
-#ifndef SETATTR_WANTS_MODE
-#define SETATTR_WANTS_MODE(attr) ((attr)->valid & (1 << 0))
-#endif // SETATTR_WANTS_MODE
-
-#ifndef SETATTR_WANTS_UID
-#define SETATTR_WANTS_UID(attr) ((attr)->valid & (1 << 1))
-#endif // SETATTR_WANTS_UID
-
-#ifndef SETATTR_WANTS_GID
-#define SETATTR_WANTS_GID(attr) ((attr)->valid & (1 << 2))
-#endif // SETATTR_WANTS_GID
-
-#ifndef SETATTR_WANTS_SIZE
-#define SETATTR_WANTS_SIZE(attr) ((attr)->valid & (1 << 3))
-#endif // SETATTR_WANTS_SIZE
-
-#ifndef SETATTR_WANTS_ACCTIME
-#define SETATTR_WANTS_ACCTIME(attr) ((attr)->valid & (1 << 4))
-#endif // SETATTR_WANTS_ACCTIME
-
-#ifndef SETATTR_WANTS_MODTIME
-#define SETATTR_WANTS_MODTIME(attr) ((attr)->valid & (1 << 5))
-#endif // SETATTR_WANTS_MODTIME
-
-#ifndef SETATTR_WANTS_CRTIME
-#define SETATTR_WANTS_CRTIME(attr) ((attr)->valid & (1 << 28))
-#endif // SETATTR_WANTS_CRTIME
-
-#ifndef SETATTR_WANTS_CHGTIME
-#define SETATTR_WANTS_CHGTIME(attr) ((attr)->valid & (1 << 29))
-#endif // SETATTR_WANTS_CHGTIME
-
-#ifndef SETATTR_WANTS_BKUPTIME
-#define SETATTR_WANTS_BKUPTIME(attr) ((attr)->valid & (1 << 30))
-#endif // SETATTR_WANTS_BKUPTIME
-
-#ifndef SETATTR_WANTS_FLAGS
-#define SETATTR_WANTS_FLAGS(attr) ((attr)->valid & (1 << 31))
-#endif // SETATTR_WANTS_FLAGS
-
-#ifndef _WIN32
-#ifdef __APPLE__
-#define G_PREFIX "org"
-#define G_KAUTH_FILESEC_XATTR G_PREFIX ".apple.system.Security"
-#define A_PREFIX "com"
-#define A_KAUTH_FILESEC_XATTR A_PREFIX ".apple.system.Security"
-#define XATTR_APPLE_PREFIX "com.apple."
-#endif
-
-#ifndef XATTR_NAME_MAX
-#define XATTR_NAME_MAX 255 /* # chars in an extended attribute name */
-#endif
-
-#ifndef XATTR_SIZE_MAX
-#define XATTR_SIZE_MAX 65536
-#endif
-#endif
-
-#ifndef fstat64
-#define fstat64 fstat
-#endif
-
-#ifndef pread64
-#define pread64 pread
-#endif
-
-#ifndef pwrite64
-#define pwrite64 pwrite
-#endif
-
-#ifndef stat64
-#define stat64 stat
-#endif
-
-#ifndef statfs64
-#define statfs64 statfs
-#endif
-
-#ifdef _WIN32
-#define UTIME_NOW ((1l << 30) - 1l)
-#define UTIME_OMIT ((1l << 30) - 2l)
-#define CONVERT_STATUS_NOT_IMPLEMENTED(e) e
-#else
-using BOOLEAN = std::uint8_t;
-using DWORD = std::uint32_t;
-using HANDLE = void *;
-using PUINT32 = std::uint32_t *;
-using PVOID = void *;
-using PWSTR = wchar_t *;
-using SIZE_T = std::uint64_t;
-using UINT16 = std::uint16_t;
-using UINT32 = std::uint32_t;
-using UINT64 = std::uint64_t;
-using VOID = void;
-using WCHAR = wchar_t;
-
-#define FILE_ATTRIBUTE_READONLY 0x00000001
-#define FILE_ATTRIBUTE_HIDDEN 0x00000002
-#define FILE_ATTRIBUTE_SYSTEM 0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE 0x00000020
-#define FILE_ATTRIBUTE_DEVICE 0x00000040
-#define FILE_ATTRIBUTE_NORMAL 0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY 0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED 0x00000800
-#define FILE_ATTRIBUTE_OFFLINE 0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000
-#define FILE_ATTRIBUTE_INTEGRITY_STREAM 0x00008000
-#define FILE_ATTRIBUTE_VIRTUAL 0x00010000
-#define FILE_ATTRIBUTE_NO_SCRUB_DATA 0x00020000
-#define FILE_ATTRIBUTE_EA 0x00040000
-#define FILE_ATTRIBUTE_PINNED 0x00080000
-#define FILE_ATTRIBUTE_UNPINNED 0x00100000
-#define FILE_ATTRIBUTE_RECALL_ON_OPEN 0x00040000
-#define FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS 0x00400000
-
-#define FILE_DIRECTORY_FILE 0x00000001
-
-#define FILE_EXECUTE (0x0020)
-#define FILE_GENERIC_EXECUTE (0x00020000L | 0x0080 | 0x0020 | 0x00100000L)
-
-#define GENERIC_READ (0x80000000L)
-#define GENERIC_WRITE (0x40000000L)
-#define GENERIC_EXECUTE (0x20000000L)
-#define GENERIC_ALL (0x10000000L)
-
-#define INVALID_FILE_ATTRIBUTES static_cast<DWORD>(-1)
-
-#define MAX_PATH 260
-
-#define STATUS_SUCCESS std::int32_t(0)
-#define STATUS_ACCESS_DENIED std::int32_t(0xC0000022L)
-#define STATUS_DEVICE_BUSY std::int32_t(0x80000011L)
-#define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::int32_t(0xC0000468L)
-#define STATUS_DIRECTORY_NOT_EMPTY std::int32_t(0xC0000101L)
-#define STATUS_FILE_IS_A_DIRECTORY std::int32_t(0xC00000BAL)
-#define STATUS_FILE_TOO_LARGE std::int32_t(0xC0000904L)
-#define STATUS_INSUFFICIENT_RESOURCES std::int32_t(0xC000009AL)
-#define STATUS_INTERNAL_ERROR std::int32_t(0xC00000E5L)
-#define STATUS_INVALID_ADDRESS std::int32_t(0xC0000141L)
-#define STATUS_INVALID_HANDLE std::int32_t(0xC0000006L)
-#define STATUS_INVALID_IMAGE_FORMAT std::int32_t(0xC000007BL)
-#define STATUS_INVALID_PARAMETER std::int32_t(0xC000000DL)
-#define STATUS_NO_MEMORY std::int32_t(0xC0000017L)
-#define STATUS_NOT_IMPLEMENTED std::int32_t(0xC0000002L)
-#define STATUS_OBJECT_NAME_EXISTS std::int32_t(0x40000000L)
-#define STATUS_OBJECT_NAME_NOT_FOUND std::int32_t(0xC0000034L)
-#define STATUS_OBJECT_PATH_INVALID std::int32_t(0xC0000039L)
-#define STATUS_UNEXPECTED_IO_ERROR std::int32_t(0xC00000E9L)
-
-#define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \
-  ((std::int32_t(e) == STATUS_NOT_IMPLEMENTED) ? -ENOTSUP : e)
-
-namespace Fsp::FileSystemBase {
-enum {
-  FspCleanupDelete = 0x01,
-  FspCleanupSetAllocationSize = 0x02,
-  FspCleanupSetArchiveBit = 0x10,
-  FspCleanupSetLastAccessTime = 0x20,
-  FspCleanupSetLastWriteTime = 0x40,
-  FspCleanupSetChangeTime = 0x80
-};
-
-struct FSP_FSCTL_FILE_INFO {
-  UINT32 FileAttributes{};
-  UINT32 ReparseTag{};
-  UINT64 AllocationSize{};
-  UINT64 FileSize{};
-  UINT64 CreationTime{};
-  UINT64 LastAccessTime{};
-  UINT64 LastWriteTime{};
-  UINT64 ChangeTime{};
-  UINT64 IndexNumber{};
-  UINT32 HardLinks{};
-  UINT32 EaSize{};
-};
-
-using FileInfo = FSP_FSCTL_FILE_INFO;
-} // namespace Fsp::FileSystemBase
-#endif
-
-using namespace Fsp;
-
 #include "platform/unix_platform.hpp"
 #include "platform/win32_platform.hpp"

--- a/include/types/remote.hpp
+++ b/include/types/remote.hpp
@ -22,8 +22,6 @@
 #ifndef INCLUDE_TYPES_REMOTE_HPP_
 #define INCLUDE_TYPES_REMOTE_HPP_

-#include "platform/platform.hpp"
-
 #define PACKET_SERVICE_FUSE 1U
 #define PACKET_SERVICE_WINFSP 2U

--- a/include/types/repertory.hpp
+++ b/include/types/repertory.hpp
@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2024> <scott.e.graves@protonmail.com>
+  Copyright <2018-2023> <scott.e.graves@protonmail.com>

  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@ -23,40 +23,6 @@
 #define INCLUDE_TYPES_REPERTORY_HPP_

 namespace repertory {
-#define REPERTORY "repertory"
-#define REPERTORY_CONFIG_VERSION 0ull
-#define REPERTORY_DATA_NAME "repertory2"
-#define REPERTORY_MIN_REMOTE_VERSION "2.0.0"
-#define REPERTORY_W L"repertory"
-
-#ifdef _WIN32
-#define REPERTORY_INVALID_HANDLE INVALID_HANDLE_VALUE
-#define REPERTORY_API_INVALID_HANDLE static_cast<std::uint64_t>(-1)
-using native_handle = HANDLE;
-#else
-#define REPERTORY_INVALID_HANDLE (-1)
-#define REPERTORY_API_INVALID_HANDLE REPERTORY_INVALID_HANDLE
-using native_handle = int;
-#endif
-
-template <class... Ts> struct overloaded : Ts... {
-  using Ts::operator()...;
-};
-template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-#define INTERFACE_SETUP(name)                                                  \
-public:                                                                        \
-  name(const name &) noexcept = delete;                                        \
-  name &operator=(const name &) noexcept = delete;                             \
-  name &operator=(name &&) noexcept = delete;                                  \
-                                                                               \
-protected:                                                                     \
-  name() = default;                                                            \
-  name(name &&) noexcept = default;                                            \
-                                                                               \
-public:                                                                        \
-  virtual ~name() = default
-
 const std::string META_ACCESSED = "accessed";
 const std::string META_ATTRIBUTES = "attributes";
 const std::string META_BACKUP = "backup";
@ -74,7 +40,7 @@ const std::string META_SOURCE = "source";
 const std::string META_UID = "uid";
 const std::string META_WRITTEN = "written";

-const std::array<std::string, 16U> META_USED_NAMES = {
+const std::vector<std::string> META_USED_NAMES = {
    META_ACCESSED, META_ATTRIBUTES, META_BACKUP,   META_CHANGED,
    META_CREATION, META_DIRECTORY,  META_GID,      META_KEY,
    META_MODE,     META_MODIFIED,   META_OSXFLAGS, META_PINNED,
@ -314,10 +280,11 @@ struct s3_config {
  bool use_region_in_url{false};
 };

+using data_buffer = std::vector<char>;
+
 using api_file_list = std::vector<api_file>;
 using api_file_provider_callback = std::function<void(api_file &)>;
 using api_item_added_callback = std::function<api_error(bool, api_file &)>;
-using data_buffer = std::vector<char>;
 using directory_item_list = std::vector<directory_item>;
 using http_headers = std::unordered_map<std::string, std::string>;
 using http_parameters = std::unordered_map<std::string, std::string>;
--- a/src/providers/encrypt/encrypt_provider.cpp
+++ b/src/providers/encrypt/encrypt_provider.cpp
@ -26,7 +26,7 @@
 #include "database/db_select.hpp"
 #include "events/event_system.hpp"
 #include "events/events.hpp"
-#include "platform/win32_platform.hpp"
+#include "platform/platform.hpp"
 #include "types/repertory.hpp"
 #include "utils/encrypting_reader.hpp"
 #include "utils/path_utils.hpp"