summaryrefslogtreecommitdiff
path: root/src/helper/options.c
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-25 15:45:17 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-25 15:45:17 +0000
commitd47e1b8f362379d8a2307f49e2b42115a3f40524 (patch)
tree6b3276ca066bf34e165c28a3de71f84dbc98175d /src/helper/options.c
parenta96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff)
downloadopenocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.gz
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.bz2
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.xz
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.zip
- rename log functions to stop conflicts under win32 (wingdi)
git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/options.c')
-rw-r--r--src/helper/options.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/helper/options.c b/src/helper/options.c
index 23b0a637..5ad09fbd 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -47,7 +47,7 @@ static struct option long_options[] =
int configuration_output_handler(struct command_context_s *context, char* line)
{
- INFO_N(line);
+ LOG_INFO_N(line);
return ERROR_OK;
}
@@ -111,14 +111,14 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
if (help_flag)
{
- OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
- OUTPUT("--help | -h\tdisplay this help\n");
- OUTPUT("--version | -v\tdisplay OpenOCD version\n");
- OUTPUT("--file | -f\tuse configuration file <name>\n");
- OUTPUT("--search | -s\tdir to search for config files and scripts\n");
- OUTPUT("--debug | -d\tset debug level <0-3>\n");
- OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
- OUTPUT("--command | -c\trun <command>\n");
+ LOG_OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
+ LOG_OUTPUT("--help | -h\tdisplay this help\n");
+ LOG_OUTPUT("--version | -v\tdisplay OpenOCD version\n");
+ LOG_OUTPUT("--file | -f\tuse configuration file <name>\n");
+ LOG_OUTPUT("--search | -s\tdir to search for config files and scripts\n");
+ LOG_OUTPUT("--debug | -d\tset debug level <0-3>\n");
+ LOG_OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
+ LOG_OUTPUT("--command | -c\trun <command>\n");
exit(-1);
}