- rename log functions to stop conflicts under win32 (wingdi)

[openocd.git] / src / target / arm_disassembler.c

diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c
index 7028e9f515c0b1ed1a25013e597a86c899f54bd4..2e87bb3c37f71d827eb1c601d6a34bd116739ca4 100644 (file)
--- a/src/target/arm_disassembler.c
+++ b/src/target/arm_disassembler.c
@@ -57,7 +57,7 @@ int evaluate_pld(u32 opcode, u32 address, arm_instruction_t *instruction)
                return ERROR_OK;
        }
        
-       ERROR("should never reach this point");
+       LOG_ERROR("should never reach this point");
        return -1;
 }
 
@@ -1317,7 +1317,7 @@ int arm_evaluate_opcode(u32 opcode, u32 address, arm_instruction_t *instruction)
                        return evaluate_cdp_mcr_mrc(opcode, address, instruction);
        }
        
-       ERROR("should never reach this point");
+       LOG_ERROR("should never reach this point");
        return -1;
 }
 
@@ -2076,7 +2076,7 @@ int thumb_evaluate_opcode(u16 opcode, u32 address, arm_instruction_t *instructio
                }
        }
 
-       ERROR("should never reach this point (opcode=%04x)",opcode);
+       LOG_ERROR("should never reach this point (opcode=%04x)",opcode);
        return -1;
 }
 
@@ -2110,7 +2110,7 @@ int arm_access_size(arm_instruction_t *instruction)
        }
        else
        {
-               ERROR("BUG: instruction type %i isn't a load/store instruction", instruction->type);
+               LOG_ERROR("BUG: instruction type %i isn't a load/store instruction", instruction->type);
                return 0;
        }
 }