libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileReader/Writer: Refactor to remove <Windows.h> include

This commit is contained in:
Luke Street 2022-02-22 00:46:49 -05:00
parent e13b498266
commit f27a63f312
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/athena/FileReader.hpp
View File

@ -1,14 +1,6 @@
#pragma once #pragma once
#if _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#else
#include <cstdio> #include <cstdio>
#endif
#include <memory> #include <memory>
#include <string> #include <string>
@ -49,7 +41,7 @@ public:
void setCacheSize(const atInt32 blockSize); void setCacheSize(const atInt32 blockSize);
#if _WIN32 #if _WIN32
using HandleType = HANDLE; using HandleType = void*;
#else #else
using HandleType = FILE*; using HandleType = FILE*;
#endif #endif

9
include/athena/FileWriter.hpp
View File

@ -1,13 +1,6 @@
#pragma once #pragma once
#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#else
#include <cstdio> #include <cstdio>
#endif
#include "athena/IStreamWriter.hpp" #include "athena/IStreamWriter.hpp"
#include "athena/Types.hpp" #include "athena/Types.hpp"
@ -43,7 +36,7 @@ public:
void writeUBytes(const atUint8* data, atUint64 len) override; void writeUBytes(const atUint8* data, atUint64 len) override;
#ifdef _WIN32 #ifdef _WIN32
using HandleType = HANDLE; using HandleType = void*;
#else #else
using HandleType = FILE*; using HandleType = FILE*;
#endif #endif

6
src/athena/FileReaderWin32.cpp
View File

@ -1,4 +1,10 @@
#include "athena/FileReader.hpp" #include "athena/FileReader.hpp"
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include "win32_largefilewrapper.h" #include "win32_largefilewrapper.h"
namespace athena::io { namespace athena::io {

4
src/athena/FileWriterWin32.cpp
View File

@ -1,5 +1,9 @@
#include "athena/FileWriter.hpp" #include "athena/FileWriter.hpp"
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>