From 38c5f51a3336cf45eb49756c0c38d3227b493fbf Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes_weisbach@gmx.net>
Date: Sun, 28 Apr 2013 19:35:36 +0000
Subject: [PATCH] avrftdi.c: rename constant ERROR to ERR
ERROR is already defined as a preprocessor macro in wingdi.h.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1144 81a1dc3b-b13d-400b-aceb-764788c761c2
---
avrftdi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/avrftdi.c b/avrftdi.c
index 8b3c8866..670e8dc4 100644
--- a/avrftdi.c
+++ b/avrftdi.c
@@ -48,7 +48,7 @@
#include <libftdi1/ftdi.h>
enum { FTDI_SCK = 1, FTDI_MOSI, FTDI_MISO, FTDI_RESET };
-enum { ERROR, WARN, INFO, DEBUG, TRACE };
+enum { ERR, WARN, INFO, DEBUG, TRACE };
#define __log(lvl, fmt, ...) \
do { \
@@ -56,7 +56,7 @@ enum { ERROR, WARN, INFO, DEBUG, TRACE };
} while(0)
-#define log_err(fmt, ...) __log(ERROR, fmt, ##__VA_ARGS__)
+#define log_err(fmt, ...) __log(ERR, fmt, ##__VA_ARGS__)
#define log_warn(fmt, ...) __log(WARN, fmt, ##__VA_ARGS__)
#define log_info(fmt, ...) __log(INFO, fmt, ##__VA_ARGS__)
#define log_debug(fmt, ...) __log(DEBUG, fmt, ##__VA_ARGS__)
@@ -161,7 +161,7 @@ static void avrftdi_log(int level, const char * func, int line,
if(!skip_prefix)
{
switch(level) {
- case ERROR: fprintf(stderr, "E "); break;
+ case ERR: fprintf(stderr, "E "); break;
case WARN: fprintf(stderr, "W "); break;
case INFO: fprintf(stderr, "I "); break;
case DEBUG: fprintf(stderr, "D "); break;