From 505c38b1cc6d0b8b8e111ab3330fa248993361c2 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 19 Dec 2020 21:29:48 +0100 Subject: [PATCH] [cctools] otool: fix duplicate symbol in {arm,i386}_disasm.c Signed-off-by: Fabian Groffen --- cctools/otool/arm_disasm.c | 2 +- cctools/otool/i386_disasm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git cctools/otool/arm_disasm.c cctools/otool/arm_disasm.c index 8a2ea5d..66f26ce 100644 --- cctools/otool/arm_disasm.c +++ cctools/otool/arm_disasm.c @@ -64,7 +64,7 @@ typedef char bfd_byte; /* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */ typedef int (*fprintf_ftype) (void *, const char*, ...); -struct disassemble_info { /* HACK'ed up for just what we need here */ +static struct disassemble_info { /* HACK'ed up for just what we need here */ fprintf_ftype fprintf_func; void *stream; diff --git cctools/otool/i386_disasm.c cctools/otool/i386_disasm.c index 0b60eb8..4bafbb3 100644 --- cctools/otool/i386_disasm.c +++ cctools/otool/i386_disasm.c @@ -1617,7 +1617,7 @@ static unsigned int xmm_rm(int r_m, int rex) /* * This is passed to the llvm disassembler. */ -struct disassemble_info { +static struct disassemble_info { enum bool verbose; /* Relocation information. */ struct relocation_info *sorted_relocs; -- 2.38.1