-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kcov: fix another missing include in macOS system headers
- Loading branch information
Showing
2 changed files
with
17 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,8 +11,8 @@ sources: | |
patches: | ||
"42": | ||
- patch_file: "patches/0003-fix-missing-include.patch" | ||
patch_description: "Add a missing #include <assert.h>" | ||
patch_type: "bugfix" | ||
patch_description: "Add a missing includes on macOS" | ||
patch_type: "backport" | ||
Check warning on line 15 in recipes/kcov/all/conandata.yml GitHub Actions / Lint changed files (YAML files)conandata.yml schema warning
|
||
- patch_file: "patches/0004-fix-libdwarf-prefix.patch" | ||
patch_description: "Adjust libdwarf include to match CCI includedirs" | ||
patch_type: "conan" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,20 @@ | ||
Use updated includes from master to fix a missing <cassert> and <sys/types.h> | ||
https://github.com/SimonKagstrom/kcov/blob/1d036f7799f95fed025c5fa0665c19df38632ab4/src/engines/mach-engine.cc | ||
|
||
--- src/engines/mach-engine.cc | ||
+++ src/engines/mach-engine.cc | ||
@@ -30,6 +30,7 @@ | ||
@@ -26,7 +26,14 @@ | ||
#include <set> | ||
#include <signal.h> | ||
#include <spawn.h> | ||
+#include <sys/errno.h> | ||
+// clang-format off | ||
+// sys/ptrace.h needs sys/types.h, so make sure clang-format doesn't change the order | ||
+#include <sys/types.h> | ||
#include <sys/ptrace.h> | ||
+// clang-format on | ||
+#include <cassert> | ||
+#include <iostream> | ||
#include <unistd.h> | ||
#include <unordered_map> | ||
#include <utils.hh> | ||
+#include <assert.h> | ||
|
||
using namespace kcov; | ||
extern char** environ; |