1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Fukui Daichi <a.dog.will.talk@akane.waseda.jp>
Last-Update: 2023-01-17
Subject: Use debugbreak package
---
CMakeLists.txt | 2 +-
src/c4/error.hpp | 2 +-
tools/amalgamate.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1207d1b..171d17f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,6 @@ set(C4CORE_SRC_FILES
c4/windows_push.hpp
c4/c4core.natvis
#
- c4/ext/debugbreak/debugbreak.h
c4/ext/rng/rng.hpp
c4/ext/sg14/inplace_function.h
)
diff --git a/src/c4/error.hpp b/src/c4/error.hpp
index 26e457b..e70c2c3 100644
--- a/src/c4/error.hpp
+++ b/src/c4/error.hpp
@@ -74,7 +74,7 @@ struct fail_type__ {};
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wundef"
# endif
-# include <c4/ext/debugbreak/debugbreak.h>
+# include <debugbreak.h>
# define C4_DEBUG_BREAK() if(c4::is_debugger_attached()) { ::debug_break(); }
# ifdef __clang__
# pragma clang diagnostic pop
diff --git a/tools/amalgamate.py b/tools/amalgamate.py
index eabcb48..64db386 100644
--- a/tools/amalgamate.py
+++ b/tools/amalgamate.py
@@ -67,7 +67,7 @@ INSTRUCTIONS:
"src/c4/language.hpp",
"src/c4/types.hpp",
"src/c4/config.hpp",
- am.hdrfile("src/c4/ext/debugbreak/debugbreak.h", "c4/ext/debugbreak/debugbreak.h", "DEBUG_BREAK_H"),
+ am.hdrfile("/usr/include/debugbreak.h", "debugbreak.h", "DEBUG_BREAK_H"),
"src/c4/error.hpp",
"src/c4/memory_util.hpp",
"src/c4/memory_resource.hpp",
|
