[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-655-g12d1ad0c7

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  12d1ad0c75298d56827debcacc83c679bfbe9ac2 (commit)
      from  8789513fa94ff54f08eaffedce0cc6c38f44311d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 12d1ad0c75298d56827debcacc83c679bfbe9ac2
Author: fatalc <cn...@gm...>
Date:   Mon Apr 25 12:06:10 2022 +0800

    target/disassembler:  update capstone include path to <capstone.h>
    
    on macos (homebrew base) `pkg-config --cflags capstone` output with
    `-I/opt/homebrew/Cellar/capstone/4.0.2/include/capstone`
    gcc not find headers on parent "include" path,
    causes build error `fatal error: 'capstone/capstone.h' file not found`
    it's ok to change to <capstone.h> for all platforms.
    
    Signed-off-by: fatalc <cn...@gm...>
    Change-Id: Ia2e2058024d4fc1a57a8b4ea847c664d74f67efb
    Reviewed-on: https://review.openocd.org/c/openocd/+/6946
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/a64_disassembler.c b/src/target/a64_disassembler.c
index bd78129dd..58ddf603e 100644
--- a/src/target/a64_disassembler.c
+++ b/src/target/a64_disassembler.c
@@ -26,7 +26,7 @@
 
 #if HAVE_CAPSTONE
 
-#include <capstone/capstone.h>
+#include <capstone.h>
 
 static void print_opcode(struct command_invocation *cmd, const cs_insn *insn)
 {
diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 661859379..d3d27a93c 100644
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -27,7 +27,7 @@
 #include <helper/log.h>
 
 #if HAVE_CAPSTONE
-#include <capstone/capstone.h>
+#include <capstone.h>
 #endif
 
 /*

-----------------------------------------------------------------------

Summary of changes:
 src/target/a64_disassembler.c | 2 +-
 src/target/arm_disassembler.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository