mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-25 01:51:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1453 from david-bodor-at-craftunique/v1.x

Browse Source 
only include windows.h when it's unavoidable
This commit is contained in:
Gabi Melman 2020-02-26 12:41:51 +02:00 committed by GitHub
commit 32902f79ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/spdlog/common.h
View File

@ -15,18 +15,6 @@
#include <type_traits> #include <type_traits>
#include <functional> #include <functional>
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX // prevent windows redefining min/max
#endif
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif //_WIN32
#ifdef SPDLOG_COMPILED_LIB #ifdef SPDLOG_COMPILED_LIB
#undef SPDLOG_HEADER_ONLY #undef SPDLOG_HEADER_ONLY
#define SPDLOG_INLINE #define SPDLOG_INLINE

11
include/spdlog/details/windows_include.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
#ifndef NOMINMAX
#define NOMINMAX // prevent windows redefining min/max
#endif
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>

1
include/spdlog/sinks/msvc_sink.h
View File

@ -8,6 +8,7 @@
#include <spdlog/details/null_mutex.h> #include <spdlog/details/null_mutex.h>
#include <spdlog/sinks/base_sink.h> #include <spdlog/sinks/base_sink.h>
#include <spdlog/details/windows_include.h>
#include <winbase.h> #include <winbase.h>
#include <mutex> #include <mutex>

5
include/spdlog/sinks/win_eventlog_sink.h
View File

@ -30,11 +30,12 @@ Windows Registry Editor Version 5.00
#pragma once #pragma once
#include <winbase.h>
#include <spdlog/details/null_mutex.h> #include <spdlog/details/null_mutex.h>
#include <spdlog/sinks/base_sink.h> #include <spdlog/sinks/base_sink.h>
#include <spdlog/details/windows_include.h>
#include <winbase.h>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <vector> #include <vector>

2
include/spdlog/sinks/wincolor_sink.h
View File

@ -12,6 +12,8 @@
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <array> #include <array>
#include <spdlog/details/windows_include.h>
#include <wincon.h> #include <wincon.h>
namespace spdlog { namespace spdlog {