Commit 95ca14c8 authored by Michael Catanzaro's avatar Michael Catanzaro Committed by Marge Bot
Browse files

Update qemu

Part-of: <!1143>
parent 4614622c
Pipeline #282563 passed with stages
in 432 minutes and 58 seconds
...@@ -2,9 +2,7 @@ kind: autotools ...@@ -2,9 +2,7 @@ kind: autotools
sources: sources:
- kind: tar - kind: tar
url: https://download.qemu.org/qemu-5.2.0.tar.xz url: https://download.qemu.org/qemu-6.0.0.tar.xz
- kind: patch
path: files/qemu/Fix-build-after-glib-e38982df.patch
build-depends: build-depends:
- core-deps/spice-protocol.bst - core-deps/spice-protocol.bst
......
diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
index 9fa779e1..a1402a2e 100644
--- a/disas/arm-a64.cc
+++ b/disas/arm-a64.cc
@@ -17,10 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-extern "C" {
#include "qemu/osdep.h"
#include "disas/dis-asm.h"
-}
#include "vixl/a64/disasm-a64.h"
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
index 2164762b..b89acf7a 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -9,6 +9,10 @@
#ifndef DISAS_DIS_ASM_H
#define DISAS_DIS_ASM_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef void *PTR;
typedef uint64_t bfd_vma;
typedef int64_t bfd_signed_vma;
@@ -507,4 +511,8 @@ static inline bfd_vma bfd_getb16(const bfd_byte *addr)
typedef bool bfd_boolean;
+#ifdef __cplusplus
+}
+#endif
+
#endif /* DISAS_DIS_ASM_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment