diff options
| -rw-r--r-- | Private/Source/MeBus/Database.cxx | 10 | ||||
| -rw-r--r-- | Public/Kits/SystemKit/CoreAPI.hxx | 14 | ||||
| -rw-r--r-- | Public/Kits/ZipKit/NewFS-Addon.hpp | 2 | ||||
| -rw-r--r-- | Public/Kits/ZipKit/Zip.cxx | 4 | ||||
| -rw-r--r-- | Public/Kits/ZipKit/Zip.hpp | 2 |
5 files changed, 13 insertions, 19 deletions
diff --git a/Private/Source/MeBus/Database.cxx b/Private/Source/MeBus/Database.cxx deleted file mode 100644 index 8270e5d9..00000000 --- a/Private/Source/MeBus/Database.cxx +++ /dev/null @@ -1,10 +0,0 @@ -/* - * ======================================================== - * - * HCore - * Copyright Mahrouss Logic, all rights reserved. - * - * ======================================================== - */ - -//! Add this unit to compilation. diff --git a/Public/Kits/SystemKit/CoreAPI.hxx b/Public/Kits/SystemKit/CoreAPI.hxx index 64373987..8fc2d770 100644 --- a/Public/Kits/SystemKit/CoreAPI.hxx +++ b/Public/Kits/SystemKit/CoreAPI.hxx @@ -13,18 +13,18 @@ #error This API is meant to be used with C++ #endif -#ifdef MUST_PASS -#undef MUST_PASS +#ifdef CA_MUST_PASS +#undef CA_MUST_PASS #endif // unused by user side, it's a kernel thing. -#define MUST_PASS(e) ((void)e) +#define CA_MUST_PASS(e) ((void)e) -#define EXTERN_C extern "C" +#define CA_EXTERN_C extern "C" -#define STDCALL __attribute__((stdcall)) -#define CDECL __attribute__((cdecl)) -#define MSCALL __attribute__((ms_abi)) +#define CA_STDCALL __attribute__((stdcall)) +#define CA_CDECL __attribute__((cdecl)) +#define CA_MSCALL __attribute__((ms_abi)) typedef __UINT16_TYPE__ WORD; typedef __UINT32_TYPE__ DWORD; diff --git a/Public/Kits/ZipKit/NewFS-Addon.hpp b/Public/Kits/ZipKit/NewFS-Addon.hpp index 140c7c1f..1018bd22 100644 --- a/Public/Kits/ZipKit/NewFS-Addon.hpp +++ b/Public/Kits/ZipKit/NewFS-Addon.hpp @@ -16,3 +16,5 @@ /// @brief NewFS catalog has password attached to it. #define kNewFSHasPassword 256 + +class ShellInterface; diff --git a/Public/Kits/ZipKit/Zip.cxx b/Public/Kits/ZipKit/Zip.cxx index 77fa0a8f..bc09ebf2 100644 --- a/Public/Kits/ZipKit/Zip.cxx +++ b/Public/Kits/ZipKit/Zip.cxx @@ -25,11 +25,11 @@ ZipStream::~ZipStream() noexcept { HFilePtr ZipStream::FlushToFile(const char *name) { HFilePtr fp = new HFile(name); - MUST_PASS(fp); + CA_MUST_PASS(fp); this->fSharedSz = HHeap::Shared()->Size(this->fSharedData); - fp->MIME("application/x-bzip"); + fp->MIME(kZipKitMime); fp->Write(this->fSharedData, this->fSharedSz); return fp; diff --git a/Public/Kits/ZipKit/Zip.hpp b/Public/Kits/ZipKit/Zip.hpp index d0e3824a..8f8979d9 100644 --- a/Public/Kits/ZipKit/Zip.hpp +++ b/Public/Kits/ZipKit/Zip.hpp @@ -39,3 +39,5 @@ class ZipStream final { z_stream fStream; }; } // namespace ZipKit + +#define kZipKitMime "application/x-bzip" |