From 6f9e418f94cfd719b9197563d39adbb2f6805d51 Mon Sep 17 00:00:00 2001 From: George Koehler Date: Sun, 10 Jun 2018 16:24:35 -0400 Subject: [PATCH] Remove extra `#include ` to fix `uint` From my request at https://github.com/kstenerud/Musashi/pull/31 There was a conflict between Musahi's uint and OpenBSD's uint: $ cc -o m68kmake m68kmake.c $ ./m68kmake $ cc -DM68K_COMPILE_FOR_MAME=0 -c m68kcpu.c In file included from m68kcpu.c:565: In file included from /usr/include/stdio.h:46: /usr/include/sys/types.h:58:22: error: cannot combine with previous 'int' declaration specifier typedef unsigned int uint; /* Sys V compatibility */ ^ ./m68kcpu.h:75:25: note: expanded from macro 'uint' #define uint unsigned int ^ 1 error generated. --- plat/linux68k/emu/musashi/README.ACK.md | 6 +++--- plat/linux68k/emu/musashi/m68kcpu.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plat/linux68k/emu/musashi/README.ACK.md b/plat/linux68k/emu/musashi/README.ACK.md index 9e2e4c2e8..a04695129 100644 --- a/plat/linux68k/emu/musashi/README.ACK.md +++ b/plat/linux68k/emu/musashi/README.ACK.md @@ -1,3 +1,3 @@ -This is a copy of the Karl Stenerud's Musashi m68k emulator, available from -https://github.com/kstenerud/Musashi. It's MIT licensed and so is compatible -with the ACK. +This is a modified copy of the Karl Stenerud's Musashi m68k emulator, +available from https://github.com/kstenerud/Musashi. It's MIT licensed +and so is compatible with the ACK. diff --git a/plat/linux68k/emu/musashi/m68kcpu.c b/plat/linux68k/emu/musashi/m68kcpu.c index 45e20aa65..89820c0f0 100755 --- a/plat/linux68k/emu/musashi/m68kcpu.c +++ b/plat/linux68k/emu/musashi/m68kcpu.c @@ -562,7 +562,6 @@ void m68k_set_instr_hook_callback(void (*callback)(void)) CALLBACK_INSTR_HOOK = callback ? callback : default_instr_hook_callback; } -#include /* Set the CPU type. */ void m68k_set_cpu_type(unsigned int cpu_type) {