Skip to content

Fully isolate windows.h includes to source files #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremy-rifkin merged 2 commits into from
Mar 11, 2026
Merged

Fully isolate windows.h includes to source files #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a22f949
Substitute `windows.h` for `excpt.h` in `from_current.hpp`
ZeroMemes Mar 9, 2026
28545b4
Resolve missing include in `from_current.cpp`
ZeroMemes Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/cpptrace/from_current.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <utility>

#ifdef _MSC_VER
#include <windows.h>
#include <excpt.h>
#endif

#include <cpptrace/basic.hpp>
Expand Down Expand Up @@ -43,11 +43,11 @@ CPPTRACE_BEGIN_NAMESPACE

#ifdef _MSC_VER
CPPTRACE_EXPORT CPPTRACE_FORCE_NO_INLINE
int maybe_collect_trace(EXCEPTION_POINTERS* exception_ptrs, int filter_result);
int maybe_collect_trace(_EXCEPTION_POINTERS* exception_ptrs, int filter_result);
CPPTRACE_EXPORT CPPTRACE_FORCE_NO_INLINE
void maybe_collect_trace(EXCEPTION_POINTERS* exception_ptrs, const std::type_info& type_info);
void maybe_collect_trace(_EXCEPTION_POINTERS* exception_ptrs, const std::type_info& type_info);
template<typename E>
CPPTRACE_FORCE_NO_INLINE inline int exception_filter(EXCEPTION_POINTERS* exception_ptrs) {
CPPTRACE_FORCE_NO_INLINE inline int exception_filter(_EXCEPTION_POINTERS* exception_ptrs) {
maybe_collect_trace(exception_ptrs, typeid(E));
return EXCEPTION_CONTINUE_SEARCH;
}
Expand Down
7 changes: 7 additions & 0 deletions src/from_current.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
#include "logging.hpp"
#include "unwind/unwind.hpp"

#if IS_WINDOWS
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif

#ifndef _MSC_VER
#include <cstring>
#endif
Expand Down
4 changes: 4 additions & 0 deletions test/unit/tracing/from_current.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#include <algorithm>
#include <string>

#ifdef _MSC_VER
#include <windows.h>
#endif

#include <gtest/gtest.h>
#include <gtest/gtest-matchers.h>
#include <gmock/gmock.h>
Expand Down
Loading