diff options
| author | Dimitrij Mijoski | 2022-10-03 15:36:37 +0200 |
|---|---|---|
| committer | GitHub | 2022-10-03 15:36:37 +0200 |
| commit | 980c20694ecb60e3671ee3c08a53b4b720f5d4ae (patch) | |
| tree | 5df25361bc768c558ab0d69bdf8ae43f9730f815 /src/catch2 | |
| parent | 4db8b50aab9f91f31b2953455091e257942ec188 (diff) | |
| download | catch3-980c20694ecb60e3671ee3c08a53b4b720f5d4ae.tar.gz | |
Don't expose header windows.h in catch_all.hpp (#2526)
* Don't expose header windows.h in catch_all.hpp
* Fix generateAmalgamatedFiles.py
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/catch_all.hpp | 1 | ||||
| -rw-r--r-- | src/catch2/internal/catch_windows_h_proxy.hpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 94f55223..bd83f5a7 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -114,7 +114,6 @@ #include <catch2/internal/catch_unique_ptr.hpp> #include <catch2/internal/catch_void_type.hpp> #include <catch2/internal/catch_wildcard_pattern.hpp> -#include <catch2/internal/catch_windows_h_proxy.hpp> #include <catch2/internal/catch_xmlwriter.hpp> #include <catch2/matchers/catch_matchers_all.hpp> #include <catch2/reporters/catch_reporters_all.hpp> diff --git a/src/catch2/internal/catch_windows_h_proxy.hpp b/src/catch2/internal/catch_windows_h_proxy.hpp index 14fe747d..0d260302 100644 --- a/src/catch2/internal/catch_windows_h_proxy.hpp +++ b/src/catch2/internal/catch_windows_h_proxy.hpp @@ -21,11 +21,7 @@ # define WIN32_LEAN_AND_MEAN #endif -#ifdef __AFXDLL -#include <AfxWin.h> -#else #include <windows.h> -#endif #endif // defined(CATCH_PLATFORM_WINDOWS) |