yaft: fix debug logging

DEBUG was defined at least in configure's config.h, so it conflicts with
the enum definition
This commit is contained in:
Stefan Seyfried
2018-01-03 21:47:59 +01:00
committed by Thilo Graf
parent 00be19e8bb
commit d1b167781c
2 changed files with 12 additions and 0 deletions

View File

@@ -22,6 +22,10 @@
* in all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
*/ */
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#ifdef DEBUG
/* maybe on compiler command line or in neutrino config.h */
#undef DEBUG
#endif
enum { enum {
CMAP_COLOR_LENGTH = sizeof(__u16) * BITS_PER_BYTE, CMAP_COLOR_LENGTH = sizeof(__u16) * BITS_PER_BYTE,

View File

@@ -21,6 +21,10 @@
* The above copyright notice and this permission notice shall be included * The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
*/ */
#ifdef DEBUG
/* maybe on command line? */
#undef DEBUG
#endif
#include "yaft.h" #include "yaft.h"
#include "conf.h" #include "conf.h"
#include "util.h" #include "util.h"
@@ -32,6 +36,10 @@
#include "parse.h" #include "parse.h"
#include "yaft_class.h" #include "yaft_class.h"
#include <driver/framebuffer.h> #include <driver/framebuffer.h>
#ifdef DEBUG
#warning DEBUG redefined!
#undef DEBUG
#endif
static void sig_handler(int signo) static void sig_handler(int signo)
{ {