Fix enabling of LIBNFC_DEBUG_OUTPUT

- inclusion of log-printf.c didn't align with needed preprocessor definitions
- Added extra #error as well as preprocessor protection
- fixed CMakeList to specify -DLOG as appropriate per the header log.h usage
This commit is contained in:
Alex Lian 2013-01-27 21:55:34 -05:00
parent 21302147a9
commit 1e184f95e4
2 changed files with 9 additions and 1 deletions

View file

@ -29,7 +29,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
# Options # Options
SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip") SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip")
IF(LIBNFC_DEBUG_OUTPUT) IF(LIBNFC_DEBUG_OUTPUT)
ADD_DEFINITIONS(-DDEBUG -g3) ADD_DEFINITIONS(-DDEBUG -DLOG -g3)
ENDIF(LIBNFC_DEBUG_OUTPUT) ENDIF(LIBNFC_DEBUG_OUTPUT)
# Doxygen # Doxygen

View file

@ -25,6 +25,12 @@
#include <stdarg.h> #include <stdarg.h>
#include <fcntl.h> #include <fcntl.h>
#ifndef LOG
// Leaving in a preprocessor error, as the build system should skip this
// file otherwise.
#error "No logging defined, but log-printf.c still compiled."
#else // LOG
void void
log_init(const nfc_context *context) log_init(const nfc_context *context)
{ {
@ -67,3 +73,5 @@ log_put(const uint8_t group, const char *category, const uint8_t priority, const
} }
} }
} }
#endif // LOG