From f2591564379c592680cabd69df5940cf22fcda8b Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Mon, 13 Aug 2012 20:41:42 +0300 Subject: [PATCH 1/2] Fix global variables collision with libusb Signed-off-by: Vasily Khoruzhick --- libfprint/core.c | 12 ++++++------ libfprint/fp_internal.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libfprint/core.c b/libfprint/core.c index 401c491..80cd4da 100644 --- a/libfprint/core.c +++ b/libfprint/core.c @@ -291,25 +291,25 @@ void fpi_log(enum fpi_log_level level, const char *component, #ifndef ENABLE_DEBUG_LOGGING if (!log_level) return; - if (level == LOG_LEVEL_WARNING && log_level < 2) + if (level == FPRINT_LOG_LEVEL_WARNING && log_level < 2) return; - if (level == LOG_LEVEL_INFO && log_level < 3) + if (level == FPRINT_LOG_LEVEL_INFO && log_level < 3) return; #endif switch (level) { - case LOG_LEVEL_INFO: + case FPRINT_LOG_LEVEL_INFO: prefix = "info"; break; - case LOG_LEVEL_WARNING: + case FPRINT_LOG_LEVEL_WARNING: stream = stderr; prefix = "warning"; break; - case LOG_LEVEL_ERROR: + case FPRINT_LOG_LEVEL_ERROR: stream = stderr; prefix = "error"; break; - case LOG_LEVEL_DEBUG: + case FPRINT_LOG_LEVEL_DEBUG: stream = stderr; prefix = "debug"; break; diff --git a/libfprint/fp_internal.h b/libfprint/fp_internal.h index e6134d4..c829a4d 100644 --- a/libfprint/fp_internal.h +++ b/libfprint/fp_internal.h @@ -33,10 +33,10 @@ (type *)( (char *)__mptr - offsetof(type,member) );}) enum fpi_log_level { - LOG_LEVEL_DEBUG, - LOG_LEVEL_INFO, - LOG_LEVEL_WARNING, - LOG_LEVEL_ERROR, + FPRINT_LOG_LEVEL_DEBUG, + FPRINT_LOG_LEVEL_INFO, + FPRINT_LOG_LEVEL_WARNING, + FPRINT_LOG_LEVEL_ERROR, }; void fpi_log(enum fpi_log_level, const char *component, const char *function, @@ -53,14 +53,14 @@ void fpi_log(enum fpi_log_level, const char *component, const char *function, #endif #ifdef ENABLE_DEBUG_LOGGING -#define fp_dbg(fmt...) _fpi_log(LOG_LEVEL_DEBUG, fmt) +#define fp_dbg(fmt...) _fpi_log(FPRINT_LOG_LEVEL_DEBUG, fmt) #else #define fp_dbg(fmt...) #endif -#define fp_info(fmt...) _fpi_log(LOG_LEVEL_INFO, fmt) -#define fp_warn(fmt...) _fpi_log(LOG_LEVEL_WARNING, fmt) -#define fp_err(fmt...) _fpi_log(LOG_LEVEL_ERROR, fmt) +#define fp_info(fmt...) _fpi_log(FPRINT_LOG_LEVEL_INFO, fmt) +#define fp_warn(fmt...) _fpi_log(FPRINT_LOG_LEVEL_WARNING, fmt) +#define fp_err(fmt...) _fpi_log(FPRINT_LOG_LEVEL_ERROR, fmt) #ifndef NDEBUG #define BUG_ON(condition) \ -- 1.7.11.4