diff options
author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
---|---|---|
committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
commit | d47e1b8f362379d8a2307f49e2b42115a3f40524 (patch) | |
tree | 6b3276ca066bf34e165c28a3de71f84dbc98175d /src/helper/log.c | |
parent | a96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff) |
- 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/log.c')
-rw-r--r-- | src/helper/log.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/helper/log.c b/src/helper/log.c index 2e985d03..d0f0e3dd 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -61,7 +61,7 @@ static int count = 0; */ static void log_puts(enum log_levels level, const char *file, int line, const char *function, const char *string) { - if (level == LOG_OUTPUT) + if (level == LOG_LVL_OUTPUT) { /* do not prepend any headers, just print out what we were given and return */ fputs(string, log_output); @@ -75,7 +75,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch if (strchr(string, '\n')!=NULL) { - if (debug_level >= LOG_DEBUG) + if (debug_level >= LOG_LVL_DEBUG) { /* print with count and time information */ int t=(int)(timeval_ms()-start); @@ -94,8 +94,8 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch fflush(log_output); - /* Never forward LOG_DEBUG, too verbose and they can be found in the log if need be */ - if (level <= LOG_INFO) + /* Never forward LOG_LVL_DEBUG, too verbose and they can be found in the log if need be */ + if (level <= LOG_LVL_INFO) { log_callback_t *cb, *next; cb = log_callbacks; @@ -205,7 +205,7 @@ int log_init(struct command_context_s *cmd_ctx) { /* set defaults for daemon configuration, if not set by cmdline or cfgfile */ if (debug_level == -1) - debug_level = LOG_INFO; + debug_level = LOG_LVL_INFO; if (log_output == NULL) { |