Skip to content
Snippets Groups Projects
Commit 9029b68f authored by Jason Jin's avatar Jason Jin Committed by Wolfgang Denk
Browse files

Fix the function conflict in x86emu when DEBUG is on


The function parse_line() in common/main.c was exposed globally by commit
6636b62a, Result in conflict with the same
name funciton in drivers/bios_emulator/x86emu/debug.c when define the DEBUG.
This patch fix this by renaming the function in the debug.c file.

Signed-off-by: default avatarJason Jin <Jason.jin@freescale.com>
parent 69710092
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment