d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove extra #include <stdio.h> to fix uint

Browse source 
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.
This commit is contained in:
George Koehler 2018-06-10 16:24:35 -04:00
parent 5404dace3a
commit 6f9e418f94
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plat/linux68k/emu/musashi/README.ACK.md
View file

@ -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.

1
plat/linux68k/emu/musashi/m68kcpu.c
View file

@ -562,7 +562,6 @@ void m68k_set_instr_hook_callback(void (*callback)(void))
CALLBACK_INSTR_HOOK = callback ? callback : default_instr_hook_callback;
}
#include <stdio.h>
/* Set the CPU type. */
void m68k_set_cpu_type(unsigned int cpu_type)
{